Merge pull request #815 from cpanato/cert-manager-1-11-0

k8s-ci-robot · web-flow · commit 1ce5daba8c67 · 2023-01-27T07:08:26.000-08:00
update cert-manager to 1.11.0 release and use python3
diff --git a/Tiltfile b/Tiltfile
@@ -19,7 +19,7 @@ settings = {
     "preload_images_for_kind": True,
     "kind_cluster_name": "capg",
     "capi_version": "v1.3.1",
-    "cert_manager_version": "v1.10.1",
+    "cert_manager_version": "v1.11.0",
     "kubernetes_version": "v1.25.5",
 }
 
diff --git a/docs/book/src/developers/development.md b/docs/book/src/developers/development.md
@@ -19,7 +19,7 @@
 5. Install [Kustomize][kustomize]
    - `brew install kustomize` on macOS.
    - [install instructions](https://kubectl.docs.kubernetes.io/installation/kustomize/) on Windows + WSL2, Linux and macOS.
-6. Install Python 3.x or 2.7.x, if neither is already installed.
+6. Install Python 3.x, if neither is already installed.
 7. Install make.
    - `brew install make` on MacOS.
    - `sudo apt install make` on Windows + WSL2.
diff --git a/hack/boilerplate/boilerplate.py.txt b/hack/boilerplate/boilerplate.py.txt
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright YEAR The Kubernetes Authors.
 #
diff --git a/hack/boilerplate/boilerplate_test.py b/hack/boilerplate/boilerplate_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2016 The Kubernetes Authors.
 #
diff --git a/hack/boilerplate/test/fail.py b/hack/boilerplate/test/fail.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2015 The Kubernetes Authors.
 #
diff --git a/hack/boilerplate/test/pass.py b/hack/boilerplate/test/pass.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2015 The Kubernetes Authors.
 #
diff --git a/hack/checkin_account.py b/hack/checkin_account.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2019 The Kubernetes Authors.
 #
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from urllib.parse import urlencode
 import sys
-import httplib
-import urllib
+import http.client as httplib
 import os
 
 BOSKOS_HOST=os.environ.get("BOSKOS_HOST", "boskos")
@@ -26,7 +26,7 @@
 
 if __name__ == "__main__":
     conn = httplib.HTTPConnection(BOSKOS_HOST)
-    conn.request("POST", "/release?%s" % urllib.urlencode({
+    conn.request("POST", "/release?%s" % urlencode({
         'name': BOSKOS_RESOURCE_NAME,
         'dest': 'dirty',
         'owner': USER,
diff --git a/hack/checkout_account.py b/hack/checkout_account.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2019 The Kubernetes Authors.
 #
@@ -16,8 +16,8 @@
 
 """Checks out a gcp account from E2E"""
 
-import urllib
-import httplib
+from urllib.parse import urlencode
+import http.client as httplib
 import os
 import sys
 import json
@@ -29,7 +29,7 @@
 
 def post_request(host, input_state = "clean"):
     conn = httplib.HTTPConnection(host)
-    conn.request("POST", "/acquire?%s" % urllib.urlencode({
+    conn.request("POST", "/acquire?%s" % urlencode({
         'type': RESOURCE_TYPE,
         'owner': USER,
         'state': input_state,
@@ -56,5 +56,5 @@ def post_request(host, input_state = "clean"):
         sys.exit("Got invalid response %d: %s" % (status, reason))
 
     body = json.loads(result)
-    print 'export BOSKOS_RESOURCE_NAME="%s";' % body['name']
-    print 'export GCP_PROJECT="%s";' % body['name']
+    print('export BOSKOS_RESOURCE_NAME="%s";' % body['name'])
+    print('export GCP_PROJECT="%s";' % body['name'])
diff --git a/hack/heartbeat_account.py b/hack/heartbeat_account.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2019 The Kubernetes Authors.
 #
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from urllib.parse import urlencode
 import sys
-import httplib
-import urllib
+import http.client as httplib
 import os
 import time
 
@@ -30,7 +30,7 @@
     # keep sending heart beat for 3 hours
     while count < 180:
         conn = httplib.HTTPConnection(BOSKOS_HOST)
-        conn.request("POST", "/update?%s" % urllib.urlencode({
+        conn.request("POST", "/update?%s" % urlencode({
             'name': BOSKOS_RESOURCE_NAME,
             'state': 'busy',
             'owner': USER,
diff --git a/hack/install-cert-manager.sh b/hack/install-cert-manager.sh
@@ -52,7 +52,7 @@ KUBECTL="${REPO_ROOT}/hack/tools/bin/kubectl"
 cd "${REPO_ROOT}" && make "${KUBECTL##*/}"
 
 ## Install cert manager and wait for availability
-"${KUBECTL}" apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.10.1/cert-manager.yaml
+"${KUBECTL}" apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.11.0/cert-manager.yaml
 "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager
 "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-cainjector
 "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook
diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
@@ -212,7 +212,7 @@ main() {
     # Check out the account from Boskos and store the produced environment
     # variables in a temporary file.
     account_env_var_file="$(mktemp)"
-    python hack/checkout_account.py 1>"${account_env_var_file}"
+    python3 hack/checkout_account.py 1>"${account_env_var_file}"
     checkout_account_status="${?}"
 
     # If the checkout process was a success then load the account's
@@ -231,7 +231,7 @@ main() {
 
     # run the heart beat process to tell boskos that we are still
     # using the checked out account periodically
-    python -u hack/heartbeat_account.py >> "$ARTIFACTS/logs/boskos.log" 2>&1 &
+    python3 -u hack/heartbeat_account.py >> "$ARTIFACTS/logs/boskos.log" 2>&1 &
     # shellcheck disable=SC2116
     HEART_BEAT_PID=$(echo $!)
   fi
diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -189,47 +189,47 @@ main() {
 
   for arg in "$@"
   do
-    if [[ "$arg" == "--verbose" ]]; then
+    if [[ "${arg}" == "--verbose" ]]; then
       set -o xtrace
     fi
-    if [[ "$arg" == "--init-image" ]]; then
+    if [[ "${arg}" == "--init-image" ]]; then
       unset SKIP_INIT_IMAGE
     fi
-    if [[ "$arg" == "--build-image-only" ]]; then
+    if [[ "${arg}" == "--build-image-only" ]]; then
       BUILD_IMAGE_ONLY="1"
     fi
   done
 
   # If BOSKOS_HOST is set then acquire an GCP account from Boskos.
-  if [ -n "${BOSKOS_HOST:-}" ]; then
+  if [[ -n "${BOSKOS_HOST:-}" ]]; then
     # Check out the account from Boskos and store the produced environment
     # variables in a temporary file.
     account_env_var_file="$(mktemp)"
-    python hack/checkout_account.py 1>"${account_env_var_file}"
+    python3 hack/checkout_account.py 1>"${account_env_var_file}"
     checkout_account_status="${?}"
 
     # If the checkout process was a success then load the account's
     # environment variables into this process.
     # shellcheck disable=SC1090
-    [ "${checkout_account_status}" = "0" ] && . "${account_env_var_file}"
+    [[ "${checkout_account_status}" = "0" ]] && . "${account_env_var_file}"
 
     # Always remove the account environment variable file. It contains
     # sensitive information.
     rm -f "${account_env_var_file}"
 
-    if [ ! "${checkout_account_status}" = "0" ]; then
+    if [[ ! "${checkout_account_status}" = "0" ]]; then
       echo "error getting account from boskos" 1>&2
       exit "${checkout_account_status}"
     fi
 
     # run the heart beat process to tell boskos that we are still
     # using the checked out account periodically
-    python -u hack/heartbeat_account.py >> "$ARTIFACTS/logs/boskos.log" 2>&1 &
+    python3 -u hack/heartbeat_account.py >> "${ARTIFACTS}/logs/boskos.log" 2>&1 &
     # shellcheck disable=SC2116
     HEART_BEAT_PID=$(echo $!)
   fi
 
-  if [[ -z "$GOOGLE_APPLICATION_CREDENTIALS" ]]; then
+  if [[ -z "${GOOGLE_APPLICATION_CREDENTIALS}" ]]; then
     cat <<EOF
 GOOGLE_APPLICATION_CREDENTIALS is not set.
 Please set this to the path of the service account used to run this script.
@@ -279,7 +279,7 @@ EOF
   echo "${test_status}"
 
   # If Boskos is being used then release the GCP project back to Boskos.
-  [ -z "${BOSKOS_HOST:-}" ] || hack/checkin_account.py >> "$ARTIFACTS/logs/boskos.log" 2>&1
+  [[ -z "${BOSKOS_HOST:-}" ]] || hack/checkin_account.py >> "${ARTIFACTS}/logs/boskos.log" 2>&1
 }
 
 main "$@"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ settings = {`
`19`	`19`	`"preload_images_for_kind": True,`
`20`	`20`	`"kind_cluster_name": "capg",`
`21`	`21`	`"capi_version": "v1.3.1",`
`22`		`- "cert_manager_version": "v1.10.1",`
	`22`	`+ "cert_manager_version": "v1.11.0",`
`23`	`23`	`"kubernetes_version": "v1.25.5",`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`
`3`	`3`	`# Copyright YEAR The Kubernetes Authors.`
`4`	`4`	`#`