From e21f3ec2f347f1f0bd6616934b23f3f219723e4c Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Thu, 29 Aug 2024 14:46:32 +0300 Subject: [PATCH] e2e: move enclave-cc to use the latest k8s version At the same time, update docs a bit to not mention any specific component versions where they are no longer relevant. Signed-off-by: Mikko Ylinen --- .github/workflows/enclave-cc-cicd.yaml | 2 +- .github/workflows/enclave-cc-e2e.yaml | 2 +- Makefile | 2 +- docs/DEVELOPMENT.md | 4 ++-- docs/INSTALL.md | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/enclave-cc-cicd.yaml b/.github/workflows/enclave-cc-cicd.yaml index 7374739a..7d96af65 100644 --- a/.github/workflows/enclave-cc-cicd.yaml +++ b/.github/workflows/enclave-cc-cicd.yaml @@ -32,7 +32,7 @@ jobs: - name: Setup kind cluster run: | - kind create cluster --image "kindest/node:v1.29.2" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s + kind create cluster --image "kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s kubectl label node coco-sgx-worker node.kubernetes.io/worker= - name: Deploy operator from the local registry diff --git a/.github/workflows/enclave-cc-e2e.yaml b/.github/workflows/enclave-cc-e2e.yaml index 777c326f..33d584af 100644 --- a/.github/workflows/enclave-cc-e2e.yaml +++ b/.github/workflows/enclave-cc-e2e.yaml @@ -42,7 +42,7 @@ jobs: - name: Setup kind cluster run: | - kind create cluster --image "kindest/node:v1.29.2" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s + kind create cluster --image "kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s kubectl label node coco-sgx-worker node.kubernetes.io/worker= docker network connect kind registry diff --git a/Makefile b/Makefile index 615459d1..3b3ad0b9 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ endif # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -ENVTEST_K8S_VERSION = 1.24.2 +ENVTEST_K8S_VERSION = 1.30.x # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index a61e90e5..2f57784c 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -3,10 +3,10 @@ These instructions should help you to build a custom version of the operator wit changes ## Prerequisites -- Golang (1.18.x) +- Golang compiler supported by the Go team - Operator SDK version (1.23.x+) - podman and podman-docker or docker -- Access to Kubernetes cluster (1.24+) +- Access to Kubernetes cluster - Container registry to store images diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 87a62fa3..b8e8093b 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -3,7 +3,6 @@ ## Prerequisites - Ensure a minimum of 8GB RAM and 2 vCPU for the Kubernetes cluster node - Only containerd runtime based Kubernetes clusters are supported with the current Confidential Containers (CoCo) release -- The minimum Kubernetes version should be 1.24. - Ensure KUBECONFIG points to the target Kubernetes cluster. - Ensure at least one Kubernetes node in the cluster is having the label `node.kubernetes.io/worker=` ```