From 561fc395b9f3e6aba31aecff673b29f5d33cb823 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:03:04 +0100 Subject: [PATCH] ci: revert name change --- .github/actions/artifact_download/action.yml | 4 ++-- .github/actions/artifact_upload/action.yml | 4 ++-- .github/actions/constellation_create/action.yml | 4 ++-- .github/actions/e2e_benchmark/action.yml | 8 ++++---- .github/actions/e2e_sonobuoy/action.yml | 4 ++-- .github/actions/e2e_test/action.yml | 10 +++++----- .github/workflows/e2e-test-daily.yml | 2 +- .github/workflows/e2e-test-release.yml | 2 +- .github/workflows/e2e-test-weekly.yml | 2 +- .github/workflows/e2e-test.yml | 2 +- .github/workflows/e2e-upgrade.yml | 16 ++++++++-------- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/actions/artifact_download/action.yml b/.github/actions/artifact_download/action.yml index 9eb16d77d..5db482d3d 100644 --- a/.github/actions/artifact_download/action.yml +++ b/.github/actions/artifact_download/action.yml @@ -9,7 +9,7 @@ inputs: description: 'Download to a specified path.' required: false default: ./ - encryption-secret: + encryptionSecret: description: 'The secret to use for decrypting the artifact.' required: true @@ -37,4 +37,4 @@ runs: shell: bash run: | mkdir -p ${{ inputs.path }} - unzip -P '${{ inputs.encryption-secret }}' -qq -d ${{ inputs.path }} ${{ steps.tempdir.outputs.directory }}/archive.zip + unzip -P '${{ inputs.encryptionSecret }}' -qq -d ${{ inputs.path }} ${{ steps.tempdir.outputs.directory }}/archive.zip diff --git a/.github/actions/artifact_upload/action.yml b/.github/actions/artifact_upload/action.yml index f6a5ec9bf..8de9b113a 100644 --- a/.github/actions/artifact_upload/action.yml +++ b/.github/actions/artifact_upload/action.yml @@ -11,7 +11,7 @@ inputs: retention-days: description: 'How long the artifact should be retained for.' default: 60 - encryption-secret: + encryptionSecret: description: 'The secret to use for encrypting the files.' required: true @@ -58,7 +58,7 @@ runs: for target in ${paths} do pushd "$(dirname "${target}")" || exit 1 - zip -e -P '${{ inputs.encryption-secret }}' -r "${{ steps.tempdir.outputs.directory }}/archive.zip" "$(basename "${target}")" + zip -e -P '${{ inputs.encryptionSecret }}' -r "${{ steps.tempdir.outputs.directory }}/archive.zip" "$(basename "${target}")" popd || exit 1 done diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml index 0c9c6e6d2..fa2d8f7e3 100644 --- a/.github/actions/constellation_create/action.yml +++ b/.github/actions/constellation_create/action.yml @@ -59,7 +59,7 @@ inputs: force: description: "Set the force-flag on apply to ignore version mismatches." required: false - encryption-secret: + encryptionSecret: description: "The secret to use for encrypting the artifact." required: true @@ -274,4 +274,4 @@ runs: name: serial-logs-${{ inputs.artifactNameSuffix }} path: > !(terraform).log - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} diff --git a/.github/actions/e2e_benchmark/action.yml b/.github/actions/e2e_benchmark/action.yml index b08285629..afc9aed38 100644 --- a/.github/actions/e2e_benchmark/action.yml +++ b/.github/actions/e2e_benchmark/action.yml @@ -17,7 +17,7 @@ inputs: awsOpenSearchPwd: description: "AWS OpenSearch Password to upload the results." required: false - encryption-secret: + encryptionSecret: description: 'The secret to use for encrypting the artifact.' required: true @@ -100,7 +100,7 @@ runs: with: path: "out/fio-constellation-${{ inputs.cloudProvider }}.json" name: "fio-constellation-${{ inputs.cloudProvider }}.json" - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} - name: Run knb benchmark shell: bash @@ -122,7 +122,7 @@ runs: with: path: "out/knb-constellation-${{ inputs.cloudProvider }}.json" name: "knb-constellation-${{ inputs.cloudProvider }}.json" - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} - name: Assume AWS role to retrieve and update benchmarks in S3 uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1 @@ -176,7 +176,7 @@ runs: path: > benchmarks/constellation-${{ inputs.cloudProvider }}.json name: "benchmarks" - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} - name: Upload benchmark results to opensearch if: (!env.ACT) diff --git a/.github/actions/e2e_sonobuoy/action.yml b/.github/actions/e2e_sonobuoy/action.yml index 7c129a692..7b87d0ee1 100644 --- a/.github/actions/e2e_sonobuoy/action.yml +++ b/.github/actions/e2e_sonobuoy/action.yml @@ -11,7 +11,7 @@ inputs: kubeconfig: description: "The kubeconfig of the cluster to test." required: true - encryption-secret: + encryptionSecret: description: 'The secret to use for encrypting the artifact.' required: true @@ -54,7 +54,7 @@ runs: with: name: "sonobuoy-logs-${{ inputs.artifactNameSuffix }}.tar.gz" path: "*_sonobuoy_*.tar.gz" - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} # Only works on "sonobuoy full" tests (e2e plugin) - name: Extract test results diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml index c1532200f..99452fa46 100644 --- a/.github/actions/e2e_test/action.yml +++ b/.github/actions/e2e_test/action.yml @@ -86,7 +86,7 @@ inputs: force: description: "Set the force-flag on apply to ignore version mismatches." required: false - encryption-secret: + encryptionSecret: description: 'The secret to use for decrypting the artifact.' required: true @@ -299,7 +299,7 @@ runs: clusterCreation: ${{ inputs.clusterCreation }} marketplaceImageVersion: ${{ inputs.marketplaceImageVersion }} force: ${{ inputs.force }} - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} - name: Deploy log- and metrics-collection (Kubernetes) id: deploy-logcollection @@ -334,7 +334,7 @@ runs: sonobuoyTestSuiteCmd: "--mode quick" kubeconfig: ${{ steps.constellation-create.outputs.kubeconfig }} artifactNameSuffix: ${{ steps.create-prefix.outputs.prefix }} - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} - name: Run sonobuoy full test if: inputs.test == 'sonobuoy full' @@ -344,7 +344,7 @@ runs: sonobuoyTestSuiteCmd: '--plugin e2e --plugin-env e2e.E2E_FOCUS="\[Conformance\]" --plugin-env e2e.E2E_SKIP="for service with type clusterIP|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol|Services should serve endpoints on same port and different protocols" --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-plugin.yaml --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-master-plugin.yaml' kubeconfig: ${{ steps.constellation-create.outputs.kubeconfig }} artifactNameSuffix: ${{ steps.create-prefix.outputs.prefix }} - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} - name: Run autoscaling test if: inputs.test == 'autoscaling' @@ -367,7 +367,7 @@ runs: awsOpenSearchDomain: ${{ inputs.awsOpenSearchDomain }} awsOpenSearchUsers: ${{ inputs.awsOpenSearchUsers }} awsOpenSearchPwd: ${{ inputs.awsOpenSearchPwd }} - encryption-secret: ${{ inputs.encryption-secret }} + encryptionSecret: ${{ inputs.encryptionSecret }} - name: Run constellation verify test if: inputs.test == 'verify' diff --git a/.github/workflows/e2e-test-daily.yml b/.github/workflows/e2e-test-daily.yml index 3514a887f..2a94d260f 100644 --- a/.github/workflows/e2e-test-daily.yml +++ b/.github/workflows/e2e-test-daily.yml @@ -91,7 +91,7 @@ jobs: awsOpenSearchUsers: ${{ secrets.AWS_OPENSEARCH_USER }} awsOpenSearchPwd: ${{ secrets.AWS_OPENSEARCH_PWD }} clusterCreation: "cli" - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - name: Always terminate cluster if: always() diff --git a/.github/workflows/e2e-test-release.yml b/.github/workflows/e2e-test-release.yml index 06a89138b..e1229b088 100644 --- a/.github/workflows/e2e-test-release.yml +++ b/.github/workflows/e2e-test-release.yml @@ -265,7 +265,7 @@ jobs: clusterCreation: ${{ matrix.clusterCreation }} s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }} s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }} - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - name: Always terminate cluster if: always() diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml index 759e7e3e3..4de0bb617 100644 --- a/.github/workflows/e2e-test-weekly.yml +++ b/.github/workflows/e2e-test-weekly.yml @@ -305,7 +305,7 @@ jobs: clusterCreation: ${{ matrix.clusterCreation }} s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }} s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }} - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - name: Always terminate cluster if: always() diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 902dd24da..2218a3270 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -246,7 +246,7 @@ jobs: s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }} marketplaceImageVersion: ${{ inputs.marketplaceImageVersion }} force: ${{ inputs.force }} - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - name: Always terminate cluster if: always() diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml index 9002f8066..98e5c2f37 100644 --- a/.github/workflows/e2e-upgrade.yml +++ b/.github/workflows/e2e-upgrade.yml @@ -215,7 +215,7 @@ jobs: awsOpenSearchUsers: ${{ secrets.AWS_OPENSEARCH_USER }} awsOpenSearchPwd: ${{ secrets.AWS_OPENSEARCH_PWD }} clusterCreation: "cli" - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - name: Remove Terraform plugin cache if: always() @@ -235,7 +235,7 @@ jobs: constellation-conf.yaml constellation-state.yaml constellation-mastersecret.json - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} e2e-upgrade: name: Run upgrade test @@ -321,8 +321,8 @@ jobs: uses: ./.github/actions/artifact_download with: name: constellation-pre-test - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + - name: Make Constellation executable and add to PATH if: always() run: | @@ -400,7 +400,7 @@ jobs: constellation-conf.yaml constellation-state.yaml constellation-mastersecret.json - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} clean-up: name: Clean up resources @@ -438,14 +438,14 @@ jobs: uses: ./.github/actions/artifact_download with: name: constellation-pre-test - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - name: Download Working Directory (Post-test) if: always() && needs.e2e-upgrade.result == 'success' uses: ./.github/actions/artifact_download with: name: constellation-post-test - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - name: Make Constellation executable and add to PATH if: always() @@ -472,7 +472,7 @@ jobs: node-operator.logs node-maintenance-operator.logs constellation-version.yaml - encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} + encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }} - name: Always terminate cluster if: always()