From d29315a7c419da66919ecb18f8a1a312940262b6 Mon Sep 17 00:00:00 2001 From: cpanato Date: Sun, 5 Nov 2023 06:12:25 -0600 Subject: [PATCH 1/4] Switch to Kubernetes Community-Owned Package Repositories Signed-off-by: cpanato --- .../cluster-template-prow-ci-version.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml index 61e8ae0e1..b9aad15d2 100644 --- a/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml +++ b/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml @@ -87,8 +87,8 @@ spec: CI_URL="https://storage.googleapis.com/k8s-release-dev/ci/$${CI_VERSION}/bin/linux/amd64" VERSION_WITHOUT_PREFIX="${CI_VERSION#v}" DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https curl - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - - echo 'deb https://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list + curl -fsSL https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg + echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list apt-get update # replace . with \. VERSION_REGEX="${VERSION_WITHOUT_PREFIX//./\\.}" @@ -222,8 +222,8 @@ spec: CI_URL="https://storage.googleapis.com/k8s-release-dev/ci/$${CI_VERSION}/bin/linux/amd64" VERSION_WITHOUT_PREFIX="${CI_VERSION#v}" DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https curl - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - - echo 'deb https://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list + curl -fsSL https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg + echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list apt-get update # replace . with \. VERSION_REGEX="${VERSION_WITHOUT_PREFIX//./\\.}" From c274f85cbbfc05e9786b41dd2643b4c1c4cf7056 Mon Sep 17 00:00:00 2001 From: cpanato Date: Sun, 5 Nov 2023 06:13:47 -0600 Subject: [PATCH 2/4] Removed kubectl --short flag (deprecated) Signed-off-by: cpanato --- .../infrastructure-gcp/cluster-template-prow-ci-version.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml index b9aad15d2..878fd6a60 100644 --- a/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml +++ b/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml @@ -119,7 +119,7 @@ spec: echo "* checking binary versions" echo "ctr version: " $(ctr version) echo "kubeadm version: " $(kubeadm version -o=short) - echo "kubectl version: " $(kubectl version --client=true --short=true) + echo "kubectl version: " $(kubectl version --client=true) echo "kubelet version: " $(kubelet --version) echo "$$LINE_SEPARATOR" owner: root:root @@ -254,7 +254,7 @@ spec: echo "* checking binary versions" echo "ctr version: " $(ctr version) echo "kubeadm version: " $(kubeadm version -o=short) - echo "kubectl version: " $(kubectl version --client=true --short=true) + echo "kubectl version: " $(kubectl version --client=true) echo "kubelet version: " $(kubelet --version) echo "$$LINE_SEPARATOR" owner: root:root From 99ab649de31ac5f5448a9c177ca5c7f29509d178 Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 8 Nov 2023 16:46:16 -0600 Subject: [PATCH 3/4] bump go to 1.20.11 Signed-off-by: cpanato --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b5392038d..194357442 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.20.10@sha256:098d628490c97d4419ed44a23d893f37b764f3bea06e0827183e8af4120e19be as builder +FROM golang:1.20.11@sha256:ddcc9c29fc589c10a26dd59198873510a526e7d1a3d81f6903690255f1118e4e as builder WORKDIR /workspace # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy From d55c2d6d05b5e5fcfc79c223c2eed3319057e56e Mon Sep 17 00:00:00 2001 From: cpanato Date: Thu, 16 Nov 2023 13:12:57 +0100 Subject: [PATCH 4/4] fix ci build because it is running on a eks cluster Signed-off-by: cpanato --- scripts/ci-make.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci-make.sh b/scripts/ci-make.sh index 98dadc214..1b2d0c4ec 100755 --- a/scripts/ci-make.sh +++ b/scripts/ci-make.sh @@ -22,4 +22,5 @@ REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. # shellcheck source=hack/ensure-go.sh source "${REPO_ROOT}/hack/ensure-go.sh" +export CONTROLLER_IMG="gcr.io/k8s-staging-cluster-api-gcp/cluster-api-gcp-controller" cd "${REPO_ROOT}" && make docker-build