From 055ca735bf7cc5859cebee9fac41e35a218cff4a Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Mon, 23 Sep 2024 11:01:23 +0200 Subject: [PATCH] ci: bump k8s versions in deployment test --- .../actions/run-deployment-test/action.yml | 11 ++----- .github/actions/setup-helm/action.yml | 29 +++++++++++++++++++ .github/actions/setup-kubectl/action.yml | 29 +++++++++++++++++++ .github/workflows/deployment-test.yaml | 6 ++-- .github/workflows/helm-lint.yaml | 5 +--- .github/workflows/release.yml | 5 +--- .github/workflows/upgradeability-test.yaml | 11 ++----- 7 files changed, 67 insertions(+), 29 deletions(-) create mode 100644 .github/actions/setup-helm/action.yml create mode 100644 .github/actions/setup-kubectl/action.yml diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml index b5ae81d96..51299360e 100644 --- a/.github/actions/run-deployment-test/action.yml +++ b/.github/actions/run-deployment-test/action.yml @@ -51,15 +51,8 @@ runs: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-java - - name: Setup Helm - uses: azure/setup-helm@v3.5 - with: - version: v3.8.1 - - - name: Setup Kubectl - uses: azure/setup-kubectl@v3.2 - with: - version: 'v1.28.2' + - uses: ./.github/actions/setup-helm + - uses: ./.github/actions/setup-kubectl - name: Create k8s Kind Cluster uses: helm/kind-action@v1.10.0 diff --git a/.github/actions/setup-helm/action.yml b/.github/actions/setup-helm/action.yml new file mode 100644 index 000000000..02d868f9f --- /dev/null +++ b/.github/actions/setup-helm/action.yml @@ -0,0 +1,29 @@ +################################################################################# +# Copyright (c) 2024 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + + +--- +name: "Setup Helm" +description: "Setup Helm" +runs: + using: "composite" + steps: + - uses: azure/setup-helm@v4 + with: + version: v3.16.1 diff --git a/.github/actions/setup-kubectl/action.yml b/.github/actions/setup-kubectl/action.yml new file mode 100644 index 000000000..369400d15 --- /dev/null +++ b/.github/actions/setup-kubectl/action.yml @@ -0,0 +1,29 @@ +################################################################################# +# Copyright (c) 2024 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + + +--- +name: "Setup Kubectl" +description: "Setup Kubectl" +runs: + using: "composite" + steps: + - uses: azure/setup-kubectl@v4 + with: + version: v1.31.1 diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml index cdb4975db..40c1818af 100644 --- a/.github/workflows/deployment-test.yaml +++ b/.github/workflows/deployment-test.yaml @@ -79,9 +79,9 @@ jobs: fail-fast: false # this will verify that the official distribution of the Tractus-X EDC Helm chart runs on the last 3 Kubernetes versions matrix: - k8s-version: [ "v1.30.2", - "v1.29.4", - "v1.28.9" ] + k8s-version: [ "v1.31.0", + "v1.30.4", + "v1.29.8" ] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml index 0b56fcea4..daf11f7c0 100644 --- a/.github/workflows/helm-lint.yaml +++ b/.github/workflows/helm-lint.yaml @@ -48,10 +48,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: helm (setup) - uses: azure/setup-helm@v4 - with: - version: v3.8.1 + - uses: ./.github/actions/setup-helm - name: python (setup) uses: actions/setup-python@v5 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e9ece814..10a908b4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,10 +84,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Install Helm - uses: azure/setup-helm@v4 - with: - version: v3.8.1 + - uses: ./.github/actions/setup-helm - name: Package helm, update index.yaml and push to gh-pages run: | # Prepare git env diff --git a/.github/workflows/upgradeability-test.yaml b/.github/workflows/upgradeability-test.yaml index 6e111793a..0cc0fcc85 100644 --- a/.github/workflows/upgradeability-test.yaml +++ b/.github/workflows/upgradeability-test.yaml @@ -45,15 +45,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: "Setup Helm" - uses: azure/setup-helm@v4 - with: - version: v3.8.1 - - - name: "Setup Kubectl" - uses: azure/setup-kubectl@v4 - with: - version: 'v1.28.2' + - uses: ./.github/actions/setup-helm + - uses: ./.github/actions/setup-kubectl - name: Create k8s Kind Cluster uses: helm/kind-action@v1.10.0