From 2b524fb5be6d5026db69b225a4749d5b7dbdd344 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 20:52:10 +0000 Subject: [PATCH 01/24] Actions Updates --- .github/workflows/close-pull-request.yaml | 67 ++++++++++++++++++++--- .github/workflows/new-pull-request.yaml | 2 +- 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index 06029a9e..17d6d49d 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -3,15 +3,9 @@ on: pull_request_target: branches: [main] types: [closed] - paths-ignore: - - 'Validated_Partners/**' - - '.github/**' - - 'docs' - - '.git' jobs: - merge-master-back-to-dev: - if: github.event.pull_request.merged == false + revert-testing-commit: timeout-minutes: 2 runs-on: ubuntu-latest steps: @@ -23,14 +17,69 @@ jobs: run: | # Get Commits from this PR TAG=PR_${{ github.event.pull_request.number }} - commits=$(git rev-list HEAD --grep=$TAG --max-count=1) + commits=$(git rev-list HEAD --grep=$TAG) echo "commits: $commits" # Revert Commits or Log that no change was made git config --local user.email "dev@null" git config --local user.name "Conformitron Bot" - git revert $commits --no-edit || echo "Commit $commits not reverted" + for commit in "{commits[@]}"; do + git revert $commit --no-edit || echo "Commit $commit not reverted" + done git push + + commit-accepted-pr-files: + if: github.event.pull_request.merged == true + timeout-minutes: 2 + runs-on: ubuntu-latest + steps: + - name: Checkout Base + uses: actions/checkout@v4 + + - name: Checkout PR Code + run: + git fetch origin pull/${{ github.event.pull_request.number }}/head:pr + + - name: Parse Namespace data, Create ConfigMap + id: find-namespace-yaml + run: | + # Pull file information down into a JSON array + readarray -t files < <(curl -s "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" | jq -c '.[]') + + # Checkout and update Developer branch + git fetch --all + git config --local user.email "dev@null" + git config --local user.name "Conformitron Bot" + # fetch most recent update to dev + git checkout developer_branch + git pull + + # Remove Deleted Files, copy over added or modified files + for item in "${files[@]}"; do + status=$(echo "$item" | jq -r '.status') + filename=$(echo "$item" | jq -r '.filename') + + if [ "$status" == renamed ]; then + git checkout pr -- $filename + git add $filename + if [ -f $(echo "$item" | jq -r '.previous_filename') ]; then + git rm $(echo "$item" | jq -r '.previous_filename') + fi + echo "Renaming $filename" + elif [ "$status" != removed ]; then + git checkout pr -- $filename + git add $filename + echo "Moving $filename" + else + if [ -f $filename ]; then + echo "Deleting $filename" + git rm $filename + fi + fi + done + + git commit -m "Adding new and changed files for merged PR_${{ github.event.pull_request.number }}" + git push diff --git a/.github/workflows/new-pull-request.yaml b/.github/workflows/new-pull-request.yaml index 1dc2c5c7..fa14ecd3 100644 --- a/.github/workflows/new-pull-request.yaml +++ b/.github/workflows/new-pull-request.yaml @@ -127,5 +127,5 @@ jobs: fi done - git commit -m "Adding new and changed files for PR_${{ github.event.pull_request.number }}" + git commit -m "Adding new and changed files for testing of PR_${{ github.event.pull_request.number }}" git push From 2e406e18b8705772ec2eaca3e9368697cefba752 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 21:05:33 +0000 Subject: [PATCH 02/24] Comments on new function --- .github/workflows/close-pull-request.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index 17d6d49d..43e7bd95 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -5,6 +5,8 @@ on: types: [closed] jobs: + + # All Closed branches reverse commits made by the open/reopen/sync GH Action revert-testing-commit: timeout-minutes: 2 runs-on: ubuntu-latest @@ -29,7 +31,8 @@ jobs: done git push - + + # Accepted PR's apply merged changes commit-accepted-pr-files: if: github.event.pull_request.merged == true timeout-minutes: 2 From 265ebc52c99cb7f91c61e12dbdc68689af3c8eea Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 21:37:50 +0000 Subject: [PATCH 03/24] GH Actions work --- .github/workflows/close-pull-request.yaml | 70 ++++++++++++++++++++--- .github/workflows/new-pull-request.yaml | 2 +- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index 06029a9e..43e7bd95 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -3,15 +3,11 @@ on: pull_request_target: branches: [main] types: [closed] - paths-ignore: - - 'Validated_Partners/**' - - '.github/**' - - 'docs' - - '.git' jobs: - merge-master-back-to-dev: - if: github.event.pull_request.merged == false + + # All Closed branches reverse commits made by the open/reopen/sync GH Action + revert-testing-commit: timeout-minutes: 2 runs-on: ubuntu-latest steps: @@ -23,14 +19,70 @@ jobs: run: | # Get Commits from this PR TAG=PR_${{ github.event.pull_request.number }} - commits=$(git rev-list HEAD --grep=$TAG --max-count=1) + commits=$(git rev-list HEAD --grep=$TAG) echo "commits: $commits" # Revert Commits or Log that no change was made git config --local user.email "dev@null" git config --local user.name "Conformitron Bot" - git revert $commits --no-edit || echo "Commit $commits not reverted" + for commit in "{commits[@]}"; do + git revert $commit --no-edit || echo "Commit $commit not reverted" + done git push + # Accepted PR's apply merged changes + commit-accepted-pr-files: + if: github.event.pull_request.merged == true + timeout-minutes: 2 + runs-on: ubuntu-latest + steps: + - name: Checkout Base + uses: actions/checkout@v4 + + - name: Checkout PR Code + run: + git fetch origin pull/${{ github.event.pull_request.number }}/head:pr + + - name: Parse Namespace data, Create ConfigMap + id: find-namespace-yaml + run: | + # Pull file information down into a JSON array + readarray -t files < <(curl -s "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" | jq -c '.[]') + + # Checkout and update Developer branch + git fetch --all + git config --local user.email "dev@null" + git config --local user.name "Conformitron Bot" + # fetch most recent update to dev + git checkout developer_branch + git pull + + # Remove Deleted Files, copy over added or modified files + for item in "${files[@]}"; do + status=$(echo "$item" | jq -r '.status') + filename=$(echo "$item" | jq -r '.filename') + + if [ "$status" == renamed ]; then + git checkout pr -- $filename + git add $filename + if [ -f $(echo "$item" | jq -r '.previous_filename') ]; then + git rm $(echo "$item" | jq -r '.previous_filename') + fi + echo "Renaming $filename" + elif [ "$status" != removed ]; then + git checkout pr -- $filename + git add $filename + echo "Moving $filename" + else + if [ -f $filename ]; then + echo "Deleting $filename" + git rm $filename + fi + fi + done + + git commit -m "Adding new and changed files for merged PR_${{ github.event.pull_request.number }}" + git push + diff --git a/.github/workflows/new-pull-request.yaml b/.github/workflows/new-pull-request.yaml index 1dc2c5c7..fa14ecd3 100644 --- a/.github/workflows/new-pull-request.yaml +++ b/.github/workflows/new-pull-request.yaml @@ -127,5 +127,5 @@ jobs: fi done - git commit -m "Adding new and changed files for PR_${{ github.event.pull_request.number }}" + git commit -m "Adding new and changed files for testing of PR_${{ github.event.pull_request.number }}" git push From 75547433ae38a91da89bada3cbc962b90f1c55f4 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 22:06:09 +0000 Subject: [PATCH 04/24] Revert "GH Actions work" This reverts commit 265ebc52c99cb7f91c61e12dbdc68689af3c8eea. --- .github/workflows/close-pull-request.yaml | 70 +++-------------------- .github/workflows/new-pull-request.yaml | 2 +- 2 files changed, 10 insertions(+), 62 deletions(-) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index 43e7bd95..06029a9e 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -3,11 +3,15 @@ on: pull_request_target: branches: [main] types: [closed] + paths-ignore: + - 'Validated_Partners/**' + - '.github/**' + - 'docs' + - '.git' jobs: - - # All Closed branches reverse commits made by the open/reopen/sync GH Action - revert-testing-commit: + merge-master-back-to-dev: + if: github.event.pull_request.merged == false timeout-minutes: 2 runs-on: ubuntu-latest steps: @@ -19,70 +23,14 @@ jobs: run: | # Get Commits from this PR TAG=PR_${{ github.event.pull_request.number }} - commits=$(git rev-list HEAD --grep=$TAG) + commits=$(git rev-list HEAD --grep=$TAG --max-count=1) echo "commits: $commits" # Revert Commits or Log that no change was made git config --local user.email "dev@null" git config --local user.name "Conformitron Bot" - for commit in "{commits[@]}"; do - git revert $commit --no-edit || echo "Commit $commit not reverted" - done + git revert $commits --no-edit || echo "Commit $commits not reverted" git push - # Accepted PR's apply merged changes - commit-accepted-pr-files: - if: github.event.pull_request.merged == true - timeout-minutes: 2 - runs-on: ubuntu-latest - steps: - - name: Checkout Base - uses: actions/checkout@v4 - - - name: Checkout PR Code - run: - git fetch origin pull/${{ github.event.pull_request.number }}/head:pr - - - name: Parse Namespace data, Create ConfigMap - id: find-namespace-yaml - run: | - # Pull file information down into a JSON array - readarray -t files < <(curl -s "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" | jq -c '.[]') - - # Checkout and update Developer branch - git fetch --all - git config --local user.email "dev@null" - git config --local user.name "Conformitron Bot" - # fetch most recent update to dev - git checkout developer_branch - git pull - - # Remove Deleted Files, copy over added or modified files - for item in "${files[@]}"; do - status=$(echo "$item" | jq -r '.status') - filename=$(echo "$item" | jq -r '.filename') - - if [ "$status" == renamed ]; then - git checkout pr -- $filename - git add $filename - if [ -f $(echo "$item" | jq -r '.previous_filename') ]; then - git rm $(echo "$item" | jq -r '.previous_filename') - fi - echo "Renaming $filename" - elif [ "$status" != removed ]; then - git checkout pr -- $filename - git add $filename - echo "Moving $filename" - else - if [ -f $filename ]; then - echo "Deleting $filename" - git rm $filename - fi - fi - done - - git commit -m "Adding new and changed files for merged PR_${{ github.event.pull_request.number }}" - git push - diff --git a/.github/workflows/new-pull-request.yaml b/.github/workflows/new-pull-request.yaml index fa14ecd3..1dc2c5c7 100644 --- a/.github/workflows/new-pull-request.yaml +++ b/.github/workflows/new-pull-request.yaml @@ -127,5 +127,5 @@ jobs: fi done - git commit -m "Adding new and changed files for testing of PR_${{ github.event.pull_request.number }}" + git commit -m "Adding new and changed files for PR_${{ github.event.pull_request.number }}" git push From d113e18bc7fca3c6122d8286d1fd1de80a22482f Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 22:10:00 +0000 Subject: [PATCH 05/24] Set targets for development --- .github/workflows/close-pull-request.yaml | 2 +- .github/workflows/new-pull-request.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index 43e7bd95..ba424f51 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -1,7 +1,7 @@ name: PR Closed - purging developer_branch on: pull_request_target: - branches: [main] + branches: [githubActions] types: [closed] jobs: diff --git a/.github/workflows/new-pull-request.yaml b/.github/workflows/new-pull-request.yaml index fa14ecd3..34c5e4de 100644 --- a/.github/workflows/new-pull-request.yaml +++ b/.github/workflows/new-pull-request.yaml @@ -2,7 +2,7 @@ name: PR Opened - moving new ISV addon to developer_branch for E2E testing on: pull_request_target: - branches: [main] + branches: [githubActions] types: [opened, reopened, synchronize] paths-ignore: - 'Validated_Partners/**' From 31b13584d2e8a9c51fb99089364f1fdcf8fab9fd Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 22:13:53 +0000 Subject: [PATCH 06/24] Commit 1 --- .../Addons/Partner/TestPartner/namespace.yaml | 8 ++++++++ .../Partner/TestPartner/solo-istiod-source.yaml | 9 +++++++++ .../Addons/Partner/TestPartner/solo-istiod.yaml | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 eks-anywhere-common/Addons/Partner/TestPartner/namespace.yaml create mode 100644 eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod-source.yaml create mode 100644 eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod.yaml diff --git a/eks-anywhere-common/Addons/Partner/TestPartner/namespace.yaml b/eks-anywhere-common/Addons/Partner/TestPartner/namespace.yaml new file mode 100644 index 00000000..e65b59c0 --- /dev/null +++ b/eks-anywhere-common/Addons/Partner/TestPartner/namespace.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: istio-system + labels: + aws.conformance.vendor: solo.io + aws.conformance.vendor-solution: solo-istiod + aws.conformance.vendor-solution-version: 1.18.3-eks-a \ No newline at end of file diff --git a/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod-source.yaml new file mode 100644 index 00000000..4089eb46 --- /dev/null +++ b/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod-source.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: solo-istiod-charts + namespace: flux-system +spec: + interval: 30s + url: https://solo-io.github.io/eks-anywhere-istio-charts diff --git a/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod.yaml b/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod.yaml new file mode 100644 index 00000000..e055c25c --- /dev/null +++ b/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: solo-istiod + namespace: istio-system +spec: + chart: + spec: + chart: solo-istiod + reconcileStrategy: ChartVersion + sourceRef: + kind: HelmRepository + name: solo-istiod-charts + namespace: flux-system + version: 1.18.3-eks-a + interval: 1m0s From e1a1ad031a6d122bb290c518fa40ce61f8428602 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 22:30:10 +0000 Subject: [PATCH 07/24] Sync --- .../Solo.1.io/solo-istiod-testJob.yaml | 29 ++++ .../Solo.1.io/solo-istiod-testjob-script.yaml | 142 ++++++++++++++++++ .../Testers/Solo.1.io/test-job-role.yaml | 29 ++++ 3 files changed, 200 insertions(+) create mode 100644 eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testJob.yaml create mode 100644 eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testjob-script.yaml create mode 100644 eks-anywhere-common/Testers/Solo.1.io/test-job-role.yaml diff --git a/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testJob.yaml b/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testJob.yaml new file mode 100644 index 00000000..4985f2fb --- /dev/null +++ b/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testJob.yaml @@ -0,0 +1,29 @@ +apiVersion: batch/v1 +kind: CronJob +metadata: + name: solo-istiod-health-test + namespace: istio-system +spec: + schedule: "10 10 * * *" + jobTemplate: + spec: + template: + spec: + containers: + - name: solo-istiod-healthtest + image: 'alpine/k8s:1.26.2' + imagePullPolicy: Always + command: + - /bin/run-functional-tests.sh + volumeMounts: + - name: functional-tests-volume + mountPath: /bin/run-functional-tests.sh + readOnly: true + subPath: run-functional-tests.sh + volumes: + - name: functional-tests-volume + configMap: + defaultMode: 0700 + name: tetsjob-script + restartPolicy: Never + \ No newline at end of file diff --git a/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testjob-script.yaml b/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testjob-script.yaml new file mode 100644 index 00000000..9673913f --- /dev/null +++ b/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testjob-script.yaml @@ -0,0 +1,142 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: tetsjob-script + namespace: istio-system +data: + run-functional-tests.sh: |- + #!/bin/sh + + # Cleanup function to remove resources + cleanup() { + echo "Cleaning up resources..." + kubectl delete gateway httpbin-gateway -n istio-system + kubectl delete deployment custom-ingressgateway -n istio-system + # Any additional cleanup commands go here + echo "Cleanup completed." + } + + # Trap statement to ensure cleanup runs on exit of the script + trap cleanup EXIT + + + error_exit() + { + echo "Test Failed: $1" 1>&2 + exit 1 + } + + deploy_custom_gateway() { + # Create a custom Istio ingress gateway + cat < Date: Wed, 1 May 2024 22:49:39 +0000 Subject: [PATCH 08/24] Update commit list iteration --- .github/workflows/close-pull-request.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index ba424f51..fdf16643 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -19,14 +19,13 @@ jobs: run: | # Get Commits from this PR TAG=PR_${{ github.event.pull_request.number }} - commits=$(git rev-list HEAD --grep=$TAG) - echo "commits: $commits" # Revert Commits or Log that no change was made git config --local user.email "dev@null" git config --local user.name "Conformitron Bot" - for commit in "{commits[@]}"; do + for commit in $(git rev-list HEAD --grep=$TAG); do + echo $commit git revert $commit --no-edit || echo "Commit $commit not reverted" done From d61e87720d747c71182184fdc1b529fe1f262241 Mon Sep 17 00:00:00 2001 From: Mike McDonald <61101829+mikemcd3912@users.noreply.github.com> Date: Wed, 1 May 2024 16:08:19 -0700 Subject: [PATCH 09/24] Revert "Multi commit" --- .../Addons/Partner/newrelic/newrelic.yaml | 2 +- .../Addons/Partner/TestPartner/namespace.yaml | 8 - .../TestPartner/solo-istiod-source.yaml | 9 -- .../Partner/TestPartner/solo-istiod.yaml | 17 --- .../Solo.1.io/solo-istiod-testJob.yaml | 29 ---- .../Solo.1.io/solo-istiod-testjob-script.yaml | 142 ------------------ .../Testers/Solo.1.io/test-job-role.yaml | 29 ---- .../Addons/Partner/newrelic/newrelic.yaml | 2 +- .../Addons/Partner/newrelic/newrelic.yaml | 2 +- eks-cloud/Partner/newrelic/newrelic.yaml | 2 +- 10 files changed, 4 insertions(+), 238 deletions(-) delete mode 100644 eks-anywhere-common/Addons/Partner/TestPartner/namespace.yaml delete mode 100644 eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod-source.yaml delete mode 100644 eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod.yaml delete mode 100644 eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testJob.yaml delete mode 100644 eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testjob-script.yaml delete mode 100644 eks-anywhere-common/Testers/Solo.1.io/test-job-role.yaml diff --git a/eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml b/eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml index 9e331bd1..44e8891c 100644 --- a/eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml +++ b/eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml @@ -13,7 +13,7 @@ spec: kind: HelmRepository name: newrelic-charts namespace: flux-system - version: 5.0.75 + version: 5.0.74 interval: 1m0s targetNamespace: newrelic values: diff --git a/eks-anywhere-common/Addons/Partner/TestPartner/namespace.yaml b/eks-anywhere-common/Addons/Partner/TestPartner/namespace.yaml deleted file mode 100644 index e65b59c0..00000000 --- a/eks-anywhere-common/Addons/Partner/TestPartner/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: istio-system - labels: - aws.conformance.vendor: solo.io - aws.conformance.vendor-solution: solo-istiod - aws.conformance.vendor-solution-version: 1.18.3-eks-a \ No newline at end of file diff --git a/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod-source.yaml deleted file mode 100644 index 4089eb46..00000000 --- a/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod-source.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: solo-istiod-charts - namespace: flux-system -spec: - interval: 30s - url: https://solo-io.github.io/eks-anywhere-istio-charts diff --git a/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod.yaml b/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod.yaml deleted file mode 100644 index e055c25c..00000000 --- a/eks-anywhere-common/Addons/Partner/TestPartner/solo-istiod.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: solo-istiod - namespace: istio-system -spec: - chart: - spec: - chart: solo-istiod - reconcileStrategy: ChartVersion - sourceRef: - kind: HelmRepository - name: solo-istiod-charts - namespace: flux-system - version: 1.18.3-eks-a - interval: 1m0s diff --git a/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testJob.yaml b/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testJob.yaml deleted file mode 100644 index 4985f2fb..00000000 --- a/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testJob.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: solo-istiod-health-test - namespace: istio-system -spec: - schedule: "10 10 * * *" - jobTemplate: - spec: - template: - spec: - containers: - - name: solo-istiod-healthtest - image: 'alpine/k8s:1.26.2' - imagePullPolicy: Always - command: - - /bin/run-functional-tests.sh - volumeMounts: - - name: functional-tests-volume - mountPath: /bin/run-functional-tests.sh - readOnly: true - subPath: run-functional-tests.sh - volumes: - - name: functional-tests-volume - configMap: - defaultMode: 0700 - name: tetsjob-script - restartPolicy: Never - \ No newline at end of file diff --git a/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testjob-script.yaml b/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testjob-script.yaml deleted file mode 100644 index 9673913f..00000000 --- a/eks-anywhere-common/Testers/Solo.1.io/solo-istiod-testjob-script.yaml +++ /dev/null @@ -1,142 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: tetsjob-script - namespace: istio-system -data: - run-functional-tests.sh: |- - #!/bin/sh - - # Cleanup function to remove resources - cleanup() { - echo "Cleaning up resources..." - kubectl delete gateway httpbin-gateway -n istio-system - kubectl delete deployment custom-ingressgateway -n istio-system - # Any additional cleanup commands go here - echo "Cleanup completed." - } - - # Trap statement to ensure cleanup runs on exit of the script - trap cleanup EXIT - - - error_exit() - { - echo "Test Failed: $1" 1>&2 - exit 1 - } - - deploy_custom_gateway() { - # Create a custom Istio ingress gateway - cat < Date: Wed, 1 May 2024 23:07:59 +0000 Subject: [PATCH 10/24] Add dependancy --- .github/workflows/close-pull-request.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index fdf16643..423ba4bc 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -34,6 +34,7 @@ jobs: # Accepted PR's apply merged changes commit-accepted-pr-files: if: github.event.pull_request.merged == true + needs: revert-testing-commit timeout-minutes: 2 runs-on: ubuntu-latest steps: From 12f7d34d701c7f3ec9cda2e1d01f19a53a5ac407 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 23:17:05 +0000 Subject: [PATCH 11/24] Commit 1 --- .../Pulumi.1/pulumi-tester-cronjob.yaml | 187 ++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 eks-anywhere-common/Testers/Pulumi.1/pulumi-tester-cronjob.yaml diff --git a/eks-anywhere-common/Testers/Pulumi.1/pulumi-tester-cronjob.yaml b/eks-anywhere-common/Testers/Pulumi.1/pulumi-tester-cronjob.yaml new file mode 100644 index 00000000..ee98c882 --- /dev/null +++ b/eks-anywhere-common/Testers/Pulumi.1/pulumi-tester-cronjob.yaml @@ -0,0 +1,187 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: pulumi-tester + namespace: pulumi +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: pulumi-tester + namespace: pulumi +rules: + - apiGroups: ["pulumi.com"] + resources: ["stacks", "programs"] + verbs: ["*"] + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "list"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: pulumi-tester + namespace: pulumi +subjects: + - kind: ServiceAccount + name: pulumi-tester +roleRef: + kind: Role + name: pulumi-tester + apiGroup: rbac.authorization.k8s.io +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: pulumi-tester + namespace: pulumi +data: + pulumi-org: aws-partnership + pulumi-k8s-operator-test.sh: |- + #!/bin/bash + set -e + + RANDOM_SUFFIX=$(date +%s)-$RANDOM + MANIFEST_FILENAME=/tmp/pulumi-test-stack-${RANDOM_SUFFIX}.yaml + + # Create a new, unique stack name. The name of the stack must be unique for each + # run for 2 reasons: + # 1. To ensure that each test run on the current platform starts from a known + # state, free from any previously test runs. + # 2. To ensure that we don't get colliding updates as AWS runs the test + # simultaneously on different EKS-A platforms. + TEST_PULUMI_STACK_NAME=test-${RANDOM_SUFFIX} + + STACKPATH=${PULUMI_ORG}/eks-pulumi-operator-test/${TEST_PULUMI_STACK_NAME} + + echo "" + echo "Writing out test manifest file '${MANIFEST_FILENAME}'" + # Note that while we use a random Pulumi stack name within the Stack resource, + # we keep the name of the Kubernetes Stack and Program resources static. This is + # intentional. If a test fails, we don't want it to leave superfluous Stack and + # Program K8s resources behind because the operator will keep trying to + # reconcile them. (The test failed - they should never be re-run again.) + # Instead, we want to reuse the same Kubernetes resource over and over but have + # it generate a new, uniquely-named Pulumi stack. + cat << EOF > $MANIFEST_FILENAME + apiVersion: pulumi.com/v1 + kind: Program + metadata: + name: eks-pulumi-operator-test + namespace: pulumi + program: + resources: + myRandomPet: + type: random:RandomPet + outputs: + petName: \${myRandomPet.id} + --- + apiVersion: pulumi.com/v1 + kind: Stack + metadata: + name: eks-pulumi-operator-test + namespace: pulumi + spec: + stack: ${STACKPATH} + programRef: + name: eks-pulumi-operator-test + destroyOnFinalize: true + envRefs: + PULUMI_ACCESS_TOKEN: + type: Secret + secret: + name: pulumi-access-token + key: accessToken + EOF + + echo "" + echo "Deploying sample stack and program." + kubectl apply -f $MANIFEST_FILENAME + + echo "" + echo "Waiting for the operator to deploy the stack." + kubectl wait -n pulumi stack/eks-pulumi-operator-test --for=condition=Ready --timeout=180s + + echo "" + echo "Verifying that the stack exists." + curl \ + -s \ + --fail \ + -H "Accept: application/vnd.pulumi+8" \ + -H "Content-Type: application/json" \ + -H "Authorization: token $PULUMI_ACCESS_TOKEN" \ + https://api.pulumi.com/api/stacks/${STACKPATH} + + echo "" + echo "Destroying K8s Stack resource" + kubectl delete -n pulumi stacks/eks-pulumi-operator-test + + echo "" + echo "Waiting for the operator to remove the stack" + kubectl wait -n pulumi stack/eks-pulumi-operator-test --for=delete --timeout=180s + + echo "" + echo "Verifying the stack no longer exists" + STATUSCODE=$(curl \ + -s \ + -o /dev/null \ + --w "%{http_code}" \ + -H "Accept: application/vnd.pulumi+8" \ + -H "Content-Type: application/json" \ + -H "Authorization: token $PULUMI_ACCESS_TOKEN" \ + https://api.pulumi.com/api/stacks/${STACKPATH} + ) + + if test $STATUSCODE -ne 404; then + echo "ERROR: Expected HTTP status code 404 from the Pulumi Cloud API when querying the stack. Got HTTP status code $STATUSCODE instead." + false + fi + + # This is for purely for running the script locally. Since the K8s tester Job is + # run in an ephemeral container, deleting the file is unnecessary in that + # context: + echo "" + echo "Deleting test manifest file '${MANIFEST_FILENAME}'" + rm ${MANIFEST_FILENAME} +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + name: pulumi-k8s-operator-test + namespace: pulumi +spec: + schedule: "10 10 * * *" + jobTemplate: + spec: + activeDeadlineSeconds: 900 + template: + spec: + serviceAccountName: pulumi-tester + containers: + - command: + - bash + - /scripts/pulumi-k8s-operator-test.sh + image: "alpine/k8s:1.26.2" + name: script + env: + - name: PULUMI_ACCESS_TOKEN + valueFrom: + secretKeyRef: + name: pulumi-access-token + key: accessToken + - name: PULUMI_ORG + valueFrom: + configMapKeyRef: + name: pulumi-tester + key: pulumi-org + volumeMounts: + - name: pulumi-tester-configmap + mountPath: /scripts/pulumi-k8s-operator-test.sh + subPath: pulumi-k8s-operator-test.sh + readOnly: false + restartPolicy: Never + volumes: + - name: pulumi-tester-configmap + configMap: + name: pulumi-tester + defaultMode: 0777 From f327e0b47eb73a1a0dc3098487ab0ed7200aabfa Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 23:19:02 +0000 Subject: [PATCH 12/24] Commit 2 --- .../Addons/Partner/Solo.1.io/namespace.yaml | 8 ++++++++ .../Partner/Solo.1.io/solo-istiod-source.yaml | 9 +++++++++ .../Addons/Partner/Solo.1.io/solo-istiod.yaml | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 eks-anywhere-common/Addons/Partner/Solo.1.io/namespace.yaml create mode 100644 eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod-source.yaml create mode 100644 eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod.yaml diff --git a/eks-anywhere-common/Addons/Partner/Solo.1.io/namespace.yaml b/eks-anywhere-common/Addons/Partner/Solo.1.io/namespace.yaml new file mode 100644 index 00000000..e65b59c0 --- /dev/null +++ b/eks-anywhere-common/Addons/Partner/Solo.1.io/namespace.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: istio-system + labels: + aws.conformance.vendor: solo.io + aws.conformance.vendor-solution: solo-istiod + aws.conformance.vendor-solution-version: 1.18.3-eks-a \ No newline at end of file diff --git a/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod-source.yaml new file mode 100644 index 00000000..4089eb46 --- /dev/null +++ b/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod-source.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: solo-istiod-charts + namespace: flux-system +spec: + interval: 30s + url: https://solo-io.github.io/eks-anywhere-istio-charts diff --git a/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod.yaml b/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod.yaml new file mode 100644 index 00000000..e055c25c --- /dev/null +++ b/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: solo-istiod + namespace: istio-system +spec: + chart: + spec: + chart: solo-istiod + reconcileStrategy: ChartVersion + sourceRef: + kind: HelmRepository + name: solo-istiod-charts + namespace: flux-system + version: 1.18.3-eks-a + interval: 1m0s From 0b3fe67629ad12f8db34aef4632428e4563acd91 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 23:27:59 +0000 Subject: [PATCH 13/24] Job naming correction --- .github/workflows/close-pull-request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index 423ba4bc..df9c30e7 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -45,7 +45,7 @@ jobs: run: git fetch origin pull/${{ github.event.pull_request.number }}/head:pr - - name: Parse Namespace data, Create ConfigMap + - name: Remove Deleted Files, copy over added or modified files in accepted PR id: find-namespace-yaml run: | # Pull file information down into a JSON array From 39eb626a252d02f8736502014519eaafc30d0c8d Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 23:31:33 +0000 Subject: [PATCH 14/24] Removing Merged PR Files --- .../Addons/Partner/Solo.1.io/namespace.yaml | 8 - .../Partner/Solo.1.io/solo-istiod-source.yaml | 9 - .../Addons/Partner/Solo.1.io/solo-istiod.yaml | 17 -- .../Pulumi.1/pulumi-tester-cronjob.yaml | 187 ------------------ 4 files changed, 221 deletions(-) delete mode 100644 eks-anywhere-common/Addons/Partner/Solo.1.io/namespace.yaml delete mode 100644 eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod-source.yaml delete mode 100644 eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod.yaml delete mode 100644 eks-anywhere-common/Testers/Pulumi.1/pulumi-tester-cronjob.yaml diff --git a/eks-anywhere-common/Addons/Partner/Solo.1.io/namespace.yaml b/eks-anywhere-common/Addons/Partner/Solo.1.io/namespace.yaml deleted file mode 100644 index e65b59c0..00000000 --- a/eks-anywhere-common/Addons/Partner/Solo.1.io/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: istio-system - labels: - aws.conformance.vendor: solo.io - aws.conformance.vendor-solution: solo-istiod - aws.conformance.vendor-solution-version: 1.18.3-eks-a \ No newline at end of file diff --git a/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod-source.yaml deleted file mode 100644 index 4089eb46..00000000 --- a/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod-source.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: solo-istiod-charts - namespace: flux-system -spec: - interval: 30s - url: https://solo-io.github.io/eks-anywhere-istio-charts diff --git a/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod.yaml b/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod.yaml deleted file mode 100644 index e055c25c..00000000 --- a/eks-anywhere-common/Addons/Partner/Solo.1.io/solo-istiod.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: solo-istiod - namespace: istio-system -spec: - chart: - spec: - chart: solo-istiod - reconcileStrategy: ChartVersion - sourceRef: - kind: HelmRepository - name: solo-istiod-charts - namespace: flux-system - version: 1.18.3-eks-a - interval: 1m0s diff --git a/eks-anywhere-common/Testers/Pulumi.1/pulumi-tester-cronjob.yaml b/eks-anywhere-common/Testers/Pulumi.1/pulumi-tester-cronjob.yaml deleted file mode 100644 index ee98c882..00000000 --- a/eks-anywhere-common/Testers/Pulumi.1/pulumi-tester-cronjob.yaml +++ /dev/null @@ -1,187 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: pulumi-tester - namespace: pulumi ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: pulumi-tester - namespace: pulumi -rules: - - apiGroups: ["pulumi.com"] - resources: ["stacks", "programs"] - verbs: ["*"] - - apiGroups: [""] - resources: ["secrets"] - verbs: ["get", "list"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: pulumi-tester - namespace: pulumi -subjects: - - kind: ServiceAccount - name: pulumi-tester -roleRef: - kind: Role - name: pulumi-tester - apiGroup: rbac.authorization.k8s.io ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: pulumi-tester - namespace: pulumi -data: - pulumi-org: aws-partnership - pulumi-k8s-operator-test.sh: |- - #!/bin/bash - set -e - - RANDOM_SUFFIX=$(date +%s)-$RANDOM - MANIFEST_FILENAME=/tmp/pulumi-test-stack-${RANDOM_SUFFIX}.yaml - - # Create a new, unique stack name. The name of the stack must be unique for each - # run for 2 reasons: - # 1. To ensure that each test run on the current platform starts from a known - # state, free from any previously test runs. - # 2. To ensure that we don't get colliding updates as AWS runs the test - # simultaneously on different EKS-A platforms. - TEST_PULUMI_STACK_NAME=test-${RANDOM_SUFFIX} - - STACKPATH=${PULUMI_ORG}/eks-pulumi-operator-test/${TEST_PULUMI_STACK_NAME} - - echo "" - echo "Writing out test manifest file '${MANIFEST_FILENAME}'" - # Note that while we use a random Pulumi stack name within the Stack resource, - # we keep the name of the Kubernetes Stack and Program resources static. This is - # intentional. If a test fails, we don't want it to leave superfluous Stack and - # Program K8s resources behind because the operator will keep trying to - # reconcile them. (The test failed - they should never be re-run again.) - # Instead, we want to reuse the same Kubernetes resource over and over but have - # it generate a new, uniquely-named Pulumi stack. - cat << EOF > $MANIFEST_FILENAME - apiVersion: pulumi.com/v1 - kind: Program - metadata: - name: eks-pulumi-operator-test - namespace: pulumi - program: - resources: - myRandomPet: - type: random:RandomPet - outputs: - petName: \${myRandomPet.id} - --- - apiVersion: pulumi.com/v1 - kind: Stack - metadata: - name: eks-pulumi-operator-test - namespace: pulumi - spec: - stack: ${STACKPATH} - programRef: - name: eks-pulumi-operator-test - destroyOnFinalize: true - envRefs: - PULUMI_ACCESS_TOKEN: - type: Secret - secret: - name: pulumi-access-token - key: accessToken - EOF - - echo "" - echo "Deploying sample stack and program." - kubectl apply -f $MANIFEST_FILENAME - - echo "" - echo "Waiting for the operator to deploy the stack." - kubectl wait -n pulumi stack/eks-pulumi-operator-test --for=condition=Ready --timeout=180s - - echo "" - echo "Verifying that the stack exists." - curl \ - -s \ - --fail \ - -H "Accept: application/vnd.pulumi+8" \ - -H "Content-Type: application/json" \ - -H "Authorization: token $PULUMI_ACCESS_TOKEN" \ - https://api.pulumi.com/api/stacks/${STACKPATH} - - echo "" - echo "Destroying K8s Stack resource" - kubectl delete -n pulumi stacks/eks-pulumi-operator-test - - echo "" - echo "Waiting for the operator to remove the stack" - kubectl wait -n pulumi stack/eks-pulumi-operator-test --for=delete --timeout=180s - - echo "" - echo "Verifying the stack no longer exists" - STATUSCODE=$(curl \ - -s \ - -o /dev/null \ - --w "%{http_code}" \ - -H "Accept: application/vnd.pulumi+8" \ - -H "Content-Type: application/json" \ - -H "Authorization: token $PULUMI_ACCESS_TOKEN" \ - https://api.pulumi.com/api/stacks/${STACKPATH} - ) - - if test $STATUSCODE -ne 404; then - echo "ERROR: Expected HTTP status code 404 from the Pulumi Cloud API when querying the stack. Got HTTP status code $STATUSCODE instead." - false - fi - - # This is for purely for running the script locally. Since the K8s tester Job is - # run in an ephemeral container, deleting the file is unnecessary in that - # context: - echo "" - echo "Deleting test manifest file '${MANIFEST_FILENAME}'" - rm ${MANIFEST_FILENAME} ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: pulumi-k8s-operator-test - namespace: pulumi -spec: - schedule: "10 10 * * *" - jobTemplate: - spec: - activeDeadlineSeconds: 900 - template: - spec: - serviceAccountName: pulumi-tester - containers: - - command: - - bash - - /scripts/pulumi-k8s-operator-test.sh - image: "alpine/k8s:1.26.2" - name: script - env: - - name: PULUMI_ACCESS_TOKEN - valueFrom: - secretKeyRef: - name: pulumi-access-token - key: accessToken - - name: PULUMI_ORG - valueFrom: - configMapKeyRef: - name: pulumi-tester - key: pulumi-org - volumeMounts: - - name: pulumi-tester-configmap - mountPath: /scripts/pulumi-k8s-operator-test.sh - subPath: pulumi-k8s-operator-test.sh - readOnly: false - restartPolicy: Never - volumes: - - name: pulumi-tester-configmap - configMap: - name: pulumi-tester - defaultMode: 0777 From cbe6ea677099d7918b18c08284b5d693c7ede1e7 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 23:37:34 +0000 Subject: [PATCH 15/24] Internal updates --- Validated_Partners/cloud.txt | 21 +++++++++++++++++++++ docs/index.1.md | 1 + 2 files changed, 22 insertions(+) create mode 100644 Validated_Partners/cloud.txt create mode 100644 docs/index.1.md diff --git a/Validated_Partners/cloud.txt b/Validated_Partners/cloud.txt new file mode 100644 index 00000000..ce7d6d23 --- /dev/null +++ b/Validated_Partners/cloud.txt @@ -0,0 +1,21 @@ +Kubernetes Version : 1.28 +Date of Conformance Test : 2024-03-26 + +Following ISV Partners have Validated their Conformance : + +VENDOR_PRODUCT VENDOR_PRODUCT_TYPE VENDOR_PRODUCT_VERSION +aqua aqua-enforcer 2022.4.20 +dynatrace dynatrace 0.10.1 +solo.io solo-istiod 1.18.3-eks-a +komodor k8s-watcher 1.15.5 +kong kong-enterprise 2.27.0 +accuknox kubearmor v0.10.2 +kubecost cost-analyzer 2.1.0 +nirmata enterprise-kyverno 1.6.10 +lacework polygraph 6.11.0 +suse neuvector 2.4.1 +newrelic nri-bundle 5.0.64 +perfectscale perfectscale v0.0.38 +pulumi pulumi-kubernetes-operator 0.3.0 +sysdig sysdig-agent 1.6.3 +hashicorp vault 0.25.0 diff --git a/docs/index.1.md b/docs/index.1.md new file mode 100644 index 00000000..4ab0748e --- /dev/null +++ b/docs/index.1.md @@ -0,0 +1 @@ +--8<-- "README.md" \ No newline at end of file From 790ed9697ba725126eac22effc5428bc9115f09b Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 23:40:39 +0000 Subject: [PATCH 16/24] Fix paths ignore --- .github/workflows/new-pull-request.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/new-pull-request.yaml b/.github/workflows/new-pull-request.yaml index 34c5e4de..4c8a3b7a 100644 --- a/.github/workflows/new-pull-request.yaml +++ b/.github/workflows/new-pull-request.yaml @@ -7,8 +7,8 @@ on: paths-ignore: - 'Validated_Partners/**' - '.github/**' - - 'docs' - - '.git' + - 'docs/**' + - '.git/**' jobs: build: From afc1799e68ecc2fd7184c832e11b0d3d68d6f961 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 1 May 2024 23:47:48 +0000 Subject: [PATCH 17/24] Remove merged test PR files --- Validated_Partners/cloud.txt | 21 --------------------- docs/index.1.md | 1 - 2 files changed, 22 deletions(-) delete mode 100644 Validated_Partners/cloud.txt delete mode 100644 docs/index.1.md diff --git a/Validated_Partners/cloud.txt b/Validated_Partners/cloud.txt deleted file mode 100644 index ce7d6d23..00000000 --- a/Validated_Partners/cloud.txt +++ /dev/null @@ -1,21 +0,0 @@ -Kubernetes Version : 1.28 -Date of Conformance Test : 2024-03-26 - -Following ISV Partners have Validated their Conformance : - -VENDOR_PRODUCT VENDOR_PRODUCT_TYPE VENDOR_PRODUCT_VERSION -aqua aqua-enforcer 2022.4.20 -dynatrace dynatrace 0.10.1 -solo.io solo-istiod 1.18.3-eks-a -komodor k8s-watcher 1.15.5 -kong kong-enterprise 2.27.0 -accuknox kubearmor v0.10.2 -kubecost cost-analyzer 2.1.0 -nirmata enterprise-kyverno 1.6.10 -lacework polygraph 6.11.0 -suse neuvector 2.4.1 -newrelic nri-bundle 5.0.64 -perfectscale perfectscale v0.0.38 -pulumi pulumi-kubernetes-operator 0.3.0 -sysdig sysdig-agent 1.6.3 -hashicorp vault 0.25.0 diff --git a/docs/index.1.md b/docs/index.1.md deleted file mode 100644 index 4ab0748e..00000000 --- a/docs/index.1.md +++ /dev/null @@ -1 +0,0 @@ ---8<-- "README.md" \ No newline at end of file From 81ab91278e9da64b50a7c6d9be1075a3feeb1684 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Fri, 3 May 2024 15:43:35 +0000 Subject: [PATCH 18/24] Testers Search update --- .github/workflows/new-pull-request.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/new-pull-request.yaml b/.github/workflows/new-pull-request.yaml index 4c8a3b7a..8fc40ae4 100644 --- a/.github/workflows/new-pull-request.yaml +++ b/.github/workflows/new-pull-request.yaml @@ -77,12 +77,15 @@ jobs: namespace_file_subdirectory=$(dirname $filename) namespace_file=$(find $namespace_file_subdirectory -name *namespace*) namespace_name="" + partner_name="" - # get namespace from dev branch partner directory + # get namespace from dev branch partner directory. If in Testers directory, re-align to Addons/Partner/{partner} while [ -z "$(find $namespace_file_subdirectory -name '*namespace*')" ] && [[ -z $namespace_name ]]; do + partner_name=$(basename $namespace_file_subdirectory) namespace_file_subdirectory=$(dirname $namespace_file_subdirectory) if [ $(basename $namespace_file_subdirectory) == "Testers" ]; then - namespace_name=$(yq e 'select(document_index==0).metadata.namespace' $filename) + namespace_file_subdirectory=$(dirname $namespace_file_subdirectory) + namespace_file_subdirectory=$namespace_file_subdirectory/Addons/Partner/$partner_name elif [ $(basename $namespace_file_subdirectory) == "Partner" ] || [ $(basename $namespace_file_subdirectory) == "Core" ]; then echo "No Namespace File Found in Partner Directory" exit 200 @@ -90,9 +93,7 @@ jobs: namespace_file=$(find $namespace_file_subdirectory -name "*namespace*") done - if [[ -n $namespace_name ]]; then - namespace_file_subdirectory=$(dirname $filename) - elif [ -f $namespace_file ]; then + if [ -f $namespace_file ]; then namespace_file_subdirectory=$(dirname $namespace_file) namespace_name=$(grep -E '^\s*metadata:\s*$|^\s*name:\s*' "$namespace_file" | awk -F':' '{gsub(/ /, "", $2); print $2}') else From dcd8c588e4363e9f2e13bd3d48bc898399262be8 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Fri, 3 May 2024 15:45:42 +0000 Subject: [PATCH 19/24] new tester File --- .../Testers/Solo.io/test-job-role2.yaml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 eks-anywhere-common/Testers/Solo.io/test-job-role2.yaml diff --git a/eks-anywhere-common/Testers/Solo.io/test-job-role2.yaml b/eks-anywhere-common/Testers/Solo.io/test-job-role2.yaml new file mode 100644 index 00000000..54d3158e --- /dev/null +++ b/eks-anywhere-common/Testers/Solo.io/test-job-role2.yaml @@ -0,0 +1,29 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: solo-istiod-job-role + namespace: istio-system +rules: + - apiGroups: [""] + resources: ["pods", "pods/exec", "services"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + - apiGroups: ["apps"] + resources: ["deployments"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + - apiGroups: ["networking.istio.io"] + resources: ["gateways", "virtualservices", "destinationrules", "serviceentries", "envoyfilters"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: solo-istiod-job-rolebinding + namespace: istio-system +subjects: + - kind: ServiceAccount + name: default + namespace: istio-system +roleRef: + kind: Role + name: solo-istiod-job-role + apiGroup: rbac.authorization.k8s.io From 2b72b26b98a9fe084fc96eaaa5b842b847ef97c0 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Fri, 3 May 2024 15:50:35 +0000 Subject: [PATCH 20/24] Sync --- .../Addons/Partner/Solo.io/solo-istiod-source.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml index 4089eb46..e16c4138 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml @@ -5,5 +5,5 @@ metadata: name: solo-istiod-charts namespace: flux-system spec: - interval: 30s + interval: 300s url: https://solo-io.github.io/eks-anywhere-istio-charts From d6333e347233037e6de1654ea7c88d7fa861f97d Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Fri, 3 May 2024 16:04:06 +0000 Subject: [PATCH 21/24] Remove Merged PR39 --- .../Partner/Solo.io/solo-istiod-source.yaml | 2 +- .../Testers/Solo.io/test-job-role2.yaml | 29 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 eks-anywhere-common/Testers/Solo.io/test-job-role2.yaml diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml index e16c4138..4089eb46 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml @@ -5,5 +5,5 @@ metadata: name: solo-istiod-charts namespace: flux-system spec: - interval: 300s + interval: 30s url: https://solo-io.github.io/eks-anywhere-istio-charts diff --git a/eks-anywhere-common/Testers/Solo.io/test-job-role2.yaml b/eks-anywhere-common/Testers/Solo.io/test-job-role2.yaml deleted file mode 100644 index 54d3158e..00000000 --- a/eks-anywhere-common/Testers/Solo.io/test-job-role2.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: solo-istiod-job-role - namespace: istio-system -rules: - - apiGroups: [""] - resources: ["pods", "pods/exec", "services"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] - - apiGroups: ["apps"] - resources: ["deployments"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] - - apiGroups: ["networking.istio.io"] - resources: ["gateways", "virtualservices", "destinationrules", "serviceentries", "envoyfilters"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: solo-istiod-job-rolebinding - namespace: istio-system -subjects: - - kind: ServiceAccount - name: default - namespace: istio-system -roleRef: - kind: Role - name: solo-istiod-job-role - apiGroup: rbac.authorization.k8s.io From dfb7f8262a8344372ce7b71b5711f01df9eea555 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Fri, 3 May 2024 16:08:15 +0000 Subject: [PATCH 22/24] Delay adjustment from 120 to 60 --- .github/workflows/new-pull-request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/new-pull-request.yaml b/.github/workflows/new-pull-request.yaml index 8fc40ae4..f9ca03d7 100644 --- a/.github/workflows/new-pull-request.yaml +++ b/.github/workflows/new-pull-request.yaml @@ -23,7 +23,7 @@ jobs: - if: ${{github.event.action == 'synchronize' }} name: Sync Pause - run: sleep 120 + run: sleep 60 - name: Parse Namespace data, Create ConfigMap id: find-namespace-yaml From 37a816781431d8c3afd622862642dca5e55c7c6b Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Fri, 3 May 2024 16:14:30 +0000 Subject: [PATCH 23/24] Fix newrelic version variance --- eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml | 2 +- eks-anywhere-snow/Addons/Partner/newrelic/newrelic.yaml | 2 +- eks-anywhere-vsphere/Addons/Partner/newrelic/newrelic.yaml | 2 +- eks-cloud/Partner/newrelic/newrelic.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml b/eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml index 44e8891c..9e331bd1 100644 --- a/eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml +++ b/eks-anywhere-baremetal/Addons/Partner/newrelic/newrelic.yaml @@ -13,7 +13,7 @@ spec: kind: HelmRepository name: newrelic-charts namespace: flux-system - version: 5.0.74 + version: 5.0.75 interval: 1m0s targetNamespace: newrelic values: diff --git a/eks-anywhere-snow/Addons/Partner/newrelic/newrelic.yaml b/eks-anywhere-snow/Addons/Partner/newrelic/newrelic.yaml index 44e8891c..9e331bd1 100644 --- a/eks-anywhere-snow/Addons/Partner/newrelic/newrelic.yaml +++ b/eks-anywhere-snow/Addons/Partner/newrelic/newrelic.yaml @@ -13,7 +13,7 @@ spec: kind: HelmRepository name: newrelic-charts namespace: flux-system - version: 5.0.74 + version: 5.0.75 interval: 1m0s targetNamespace: newrelic values: diff --git a/eks-anywhere-vsphere/Addons/Partner/newrelic/newrelic.yaml b/eks-anywhere-vsphere/Addons/Partner/newrelic/newrelic.yaml index 44e8891c..9e331bd1 100644 --- a/eks-anywhere-vsphere/Addons/Partner/newrelic/newrelic.yaml +++ b/eks-anywhere-vsphere/Addons/Partner/newrelic/newrelic.yaml @@ -13,7 +13,7 @@ spec: kind: HelmRepository name: newrelic-charts namespace: flux-system - version: 5.0.74 + version: 5.0.75 interval: 1m0s targetNamespace: newrelic values: diff --git a/eks-cloud/Partner/newrelic/newrelic.yaml b/eks-cloud/Partner/newrelic/newrelic.yaml index 44e8891c..9e331bd1 100644 --- a/eks-cloud/Partner/newrelic/newrelic.yaml +++ b/eks-cloud/Partner/newrelic/newrelic.yaml @@ -13,7 +13,7 @@ spec: kind: HelmRepository name: newrelic-charts namespace: flux-system - version: 5.0.74 + version: 5.0.75 interval: 1m0s targetNamespace: newrelic values: From 12dd7a844e7f712c5e222abeca08d2822643ff44 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Fri, 3 May 2024 18:37:31 +0000 Subject: [PATCH 24/24] Re-direct branch target for merge --- .github/workflows/close-pull-request.yaml | 2 +- .github/workflows/new-pull-request.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/close-pull-request.yaml b/.github/workflows/close-pull-request.yaml index df9c30e7..9d57ec0f 100644 --- a/.github/workflows/close-pull-request.yaml +++ b/.github/workflows/close-pull-request.yaml @@ -1,7 +1,7 @@ name: PR Closed - purging developer_branch on: pull_request_target: - branches: [githubActions] + branches: [main] types: [closed] jobs: diff --git a/.github/workflows/new-pull-request.yaml b/.github/workflows/new-pull-request.yaml index f9ca03d7..360e7344 100644 --- a/.github/workflows/new-pull-request.yaml +++ b/.github/workflows/new-pull-request.yaml @@ -2,7 +2,7 @@ name: PR Opened - moving new ISV addon to developer_branch for E2E testing on: pull_request_target: - branches: [githubActions] + branches: [main] types: [opened, reopened, synchronize] paths-ignore: - 'Validated_Partners/**'