Python upgrade and cleanup (#1001)

* Bump Python to 3.10.4

* Bump mypy to 0.961

* Change the default Helm location

* Adopt kind setup script to the latest version

Refreshed with https://kind.sigs.k8s.io/docs/user/local-registry/

* Use Python3 headers

* Remove Pipfiles

Author: slaskawi

.action_templates/steps/setup-and-install-python.yaml

@@ -1,7 +1,7 @@
 - name: Setup Python
   uses: actions/setup-python@v2
   with:
-    python-version: '3.8'
+    python-version: '3.10.4'
 - name: Cache Dependencies
   uses: actions/cache@v2
   with:

.github/workflows/e2e-dispatch.yml

@@ -55,7 +55,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10.4'
     - name: Cache Dependencies
       uses: actions/cache@v2
       with:
@@ -91,7 +91,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10.4'
     - name: Cache Dependencies
       uses: actions/cache@v2
       with:

.github/workflows/e2e-fork.yml

@@ -57,7 +57,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10.4'
     - name: Cache Dependencies
       uses: actions/cache@v2
       with:
@@ -173,7 +173,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10.4'
     - name: Cache Dependencies
       uses: actions/cache@v2
       with:

.github/workflows/e2e.yml

@@ -63,7 +63,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10.4'
     - name: Cache Dependencies
       uses: actions/cache@v2
       with:
@@ -177,7 +177,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10.4'
     - name: Cache Dependencies
       uses: actions/cache@v2
       with:

.github/workflows/release-images.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8'
+          python-version: '3.10.4'
           architecture: 'x64'
 
       - uses: actions/cache@v2

.github/workflows/release-single-image.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8'
+          python-version: '3.10.4'
           architecture: 'x64'
 
       - uses: actions/cache@v2

.gitignore

@@ -96,3 +96,6 @@ Dockerfile.ubuntu-*
 diagnostics
 
 !test/test-app/Dockerfile
+
+Pipfile
+Pipfile.lock

Makefile

@@ -163,7 +163,7 @@ controller-gen:
 ifeq (ok,$(shell test -f "$$(which helm)" && echo ok))
     HELM=$(shell which helm)
 else
-    HELM=/usr/bin/local/helm
+    HELM=/usr/local/bin/helm
 endif
 
 # Download helm locally if necessary

Pipfile

@@ -115,7 +115,7 @@ python -m pip install -r requirements.txt
 
 * create a python environment and install dependencies.
 ```bash
-pipenv install
+pipenv install -r requirements.txt
 ```
 
 * activate the python environment.

Pipfile.lock

@@ -1,7 +1,7 @@
 # Global options:
 
 [mypy]
-python_version = 3.7
+python_version = 3.10
 ignore_missing_imports = true
 disallow_untyped_calls = true
 disallow_untyped_defs = true

docs/contributing.md

@@ -6,7 +6,7 @@ jinja2==2.11.3
 MarkupSafe==2.0.1
 PyYAML==5.4.1
 black==22.3.0
-mypy==0.782
+mypy==0.961
 tqdm==v4.49.0
 boto3==1.16.21
 pymongo==3.11.4

mypy.ini

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from kubernetes.client.rest import ApiException
 

requirements.txt

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from typing import Dict
 
 from ghat.template import template_github_action

scripts/dev/e2e.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 from typing import Dict
 import os.path

scripts/dev/generate_github_actions.py

@@ -42,24 +42,24 @@ reg_name='kind-registry'
 reg_port='5000'
 running="$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)"
 if [ "${running}" != 'true' ]; then
-  docker run \
-    -d --restart=always -p "${reg_port}:${reg_port}" --name "${reg_name}" --network kind \
-    registry:2
+  docker run -d --restart=always -p "127.0.0.1:${reg_port}:5000" --name "${reg_name}" registry:2
 fi
 
-# find registry IP inside the kind network
-ip="$(docker inspect kind-registry -f '{{.NetworkSettings.Networks.kind.IPAddress}}')"
-
 # create a cluster with the local registry enabled in containerd
 cat <<EOF | kind create cluster --name "${cluster_name}" --kubeconfig "${kubeconfig_path}" --config=-
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 containerdConfigPatches:
 - |-
   [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:${reg_port}"]
-    endpoint = ["http://${ip}:${reg_port}"]
+    endpoint = ["http://${reg_name}:${reg_port}"]
 EOF
 
+# connect the registry to the cluster network if not already connected
+if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' "${reg_name}")" = 'null' ]; then
+  docker network connect "kind" "${reg_name}"
+fi
+
 # Document the local registry (from  https://kind.sigs.k8s.io/docs/user/local-registry/)
 # https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/generic/1755-communicating-a-local-registry
 cat <<EOF | kubectl apply --kubeconfig "${kubeconfig_path}" -f -

scripts/dev/get_e2e_env_vars.py

@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 // Place any runtime dependencies as imports in this file.