From 427e1bbfbd6309c6fdf398a7d3646674066a3d37 Mon Sep 17 00:00:00 2001 From: Brandon Palm Date: Wed, 4 Sep 2024 13:28:43 -0500 Subject: [PATCH] Update KinD to v0.24.0 (#485) --- .github/workflows/pre-main.yml | 6 +++--- README.md | 4 ++-- config/k8s-cluster/config.yaml | 8 ++++---- config/vagrant/scripts/bootstrap-cluster.sh | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pre-main.yml b/.github/workflows/pre-main.yml index e5dd5ac7..f8b31106 100644 --- a/.github/workflows/pre-main.yml +++ b/.github/workflows/pre-main.yml @@ -8,7 +8,7 @@ name: Test Incoming Changes workflow_dispatch: env: REGISTRY: quay.io - CERTSUITE_IMAGE_NAME: testnetworkfunction/k8s-best-practices-certsuite + CERTSUITE_IMAGE_NAME: redhat-best-practices-for-k8s/certsuite CERTSUITE_IMAGE_TAG: unstable CERTSUITE_CONFIG_DIR: /tmp/certsuite/config CERTSUITE_OUTPUT_DIR: /tmp/certsuite/output @@ -130,7 +130,7 @@ jobs: --preflight-dockerconfig=/usr/certsuite/config/dockerconfig \ --offline-db=/usr/offline-db \ --log-level=${SMOKE_TESTS_LOG_LEVEL} \ - --config-file=/usr/certsuite/config/tnf_config.yml \ + --config-file=/usr/certsuite/config/certsuite_config.yml \ --kubeconfig=/usr/certsuite/config/kubeconfig \ working-directory: certsuite @@ -146,7 +146,7 @@ jobs: --offline-db=/usr/offline-db \ --enable-data-collection=true \ --log-level=${SMOKE_TESTS_LOG_LEVEL} \ - --config-file=/usr/certsuite/config/tnf_config.yml \ + --config-file=/usr/certsuite/config/certsuite_config.yml \ --kubeconfig=/usr/certsuite/config/kubeconfig \ --label-filter="${SMOKE_TESTS_LABELS_FILTER}" working-directory: certsuite diff --git a/README.md b/README.md index 38cc23f9..683d5a07 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ sudo systemctl restart docker Download and install Kubernetes In Docker (Kind): ```shell-script -curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.23.0/kind-linux-amd64 +curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.24.0/kind-linux-amd64 ``` Configure a cluster with 4 worker nodes and one master node ( dual stack ): @@ -190,7 +190,7 @@ make install ``` This will create a PUT named "test" in `CERTSUITE_EXAMPLE_NAMESPACE` [namespace](#namespace) and Debug Daemonset named "debug". The -example `tnf_config.yml` in [`certsuite`](https://github.com/redhat-best-practices-for-k8s/certsuite) +example `certsuite_config.yml` in [`certsuite`](https://github.com/redhat-best-practices-for-k8s/certsuite) will use this local infrastructure by default. Note that this command also creates OT and CRD resources. diff --git a/config/k8s-cluster/config.yaml b/config/k8s-cluster/config.yaml index fda298db..3d77d175 100644 --- a/config/k8s-cluster/config.yaml +++ b/config/k8s-cluster/config.yaml @@ -7,10 +7,10 @@ networking: apiServerPort: 6443 nodes: - role: control-plane - image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e + image: kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865 - role: worker - image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e + image: kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865 - role: worker - image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e + image: kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865 - role: worker - image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e + image: kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865 diff --git a/config/vagrant/scripts/bootstrap-cluster.sh b/config/vagrant/scripts/bootstrap-cluster.sh index 71b35c7c..00ab420d 100755 --- a/config/vagrant/scripts/bootstrap-cluster.sh +++ b/config/vagrant/scripts/bootstrap-cluster.sh @@ -2,11 +2,11 @@ # shellcheck disable=SC2207 # Download and install Kubernetes In Docker (Kind): -sudo curl -Lo /usr/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.23.0/kind-linux-amd64 +sudo curl -Lo /usr/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.24.0/kind-linux-amd64 sudo chmod +x /usr/bin/kind # download the latest openshift client at a certain release level -RELEASE_LEVEL="4.12" +RELEASE_LEVEL="4.16" VERSIONS=($(sudo curl -sH 'Accept: application/json' "https://api.openshift.com/api/upgrades_info/v1/graph?channel=stable-${RELEASE_LEVEL}&arch=amd64" | jq -r '.nodes[].version' | sort)) IFS=$'\n' SORTED_VERSIONS=($(sort -V <<<"${VERSIONS[*]}")); unset IFS OPENSHIFT_VERSION=${SORTED_VERSIONS[${#SORTED_VERSIONS[@]} - 1]}