From 94f14790c1f52266bcf299398e8d84e86e937a33 Mon Sep 17 00:00:00 2001 From: "Badr, Nesma" Date: Tue, 5 Nov 2024 11:12:22 +0100 Subject: [PATCH 1/2] test the e2e tests with the new template-operator moduleconfig --- .github/workflows/test-e2e-with-modulereleasemeta.yml | 3 ++- .github/workflows/test-e2e.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-e2e-with-modulereleasemeta.yml b/.github/workflows/test-e2e-with-modulereleasemeta.yml index 96c1ce7055..7bf9323b90 100644 --- a/.github/workflows/test-e2e-with-modulereleasemeta.yml +++ b/.github/workflows/test-e2e-with-modulereleasemeta.yml @@ -70,8 +70,9 @@ jobs: - name: Checkout template-operator uses: actions/checkout@v4 with: - repository: kyma-project/template-operator + repository: nesmabadr/template-operator path: template-operator + ref: update_moduleconfig - name: Get configuration uses: ./lifecycle-manager/.github/actions/get-configuration diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index d1d9fe0d29..f0b18342e0 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -67,8 +67,9 @@ jobs: - name: Checkout template-operator uses: actions/checkout@v4 with: - repository: kyma-project/template-operator + repository: nesmabadr/template-operator path: template-operator + ref: update_moduleconfig - name: Get configuration uses: ./lifecycle-manager/.github/actions/get-configuration From 57982d26b540bf6079543c7b62e86c93f94371ec Mon Sep 17 00:00:00 2001 From: "Badr, Nesma" Date: Tue, 5 Nov 2024 11:45:43 +0100 Subject: [PATCH 2/2] Use generated ModuleConfig in the E2E test --- .../action.yml | 20 +++++++++++++++++-- .../deploy-template-operator/action.yml | 20 +++++++++++++++++-- .../test-e2e-with-modulereleasemeta.yml | 3 +-- .github/workflows/test-e2e.yml | 3 +-- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/.github/actions/deploy-template-operator-with-modulereleasemeta/action.yml b/.github/actions/deploy-template-operator-with-modulereleasemeta/action.yml index a2f9006ed3..c70a527ac7 100644 --- a/.github/actions/deploy-template-operator-with-modulereleasemeta/action.yml +++ b/.github/actions/deploy-template-operator-with-modulereleasemeta/action.yml @@ -113,7 +113,15 @@ runs: kustomize edit add patch --path warning_patch.yaml --kind Deployment popd make build-manifests - modulectl create --module-config-file ./module-config.yaml --registry http://localhost:5111 --insecure + echo "name: kyma-project.io/module/template-operator + channel: regular + version: 1.0.1 + security: sec-scanners-config.yaml + defaultCR: ./config/samples/default-sample-cr.yaml + manifest: template-operator.yaml + annotations: + operator.kyma-project.io/doc-url: https://kyma-project.io" >> warning-module-config.yaml + modulectl create --module-config-file ./warning-module-config.yaml --registry http://localhost:5111 --insecure sed -i 's/localhost:5111/k3d-kcp-registry.localhost:5000/g' ./template.yaml sed -i 's/template-operator-regular/template-operator-1.0.1/g' ./template.yaml kubectl get crds @@ -136,7 +144,15 @@ runs: kustomize edit add patch --path warning_patch.yaml --kind StatefulSet popd make build-statefulset-manifests - modulectl create --module-config-file ./module-config.yaml --registry http://localhost:5111 --insecure + echo "name: kyma-project.io/module/template-operator + channel: regular + version: 1.0.1 + security: sec-scanners-config.yaml + defaultCR: ./config/samples/default-sample-cr.yaml + manifest: template-operator.yaml + annotations: + operator.kyma-project.io/doc-url: https://kyma-project.io" >> warning-module-config.yaml + modulectl create --module-config-file ./warning-module-config.yaml --registry http://localhost:5111 --insecure sed -i 's/localhost:5111/k3d-kcp-registry.localhost:5000/g' ./template.yaml sed -i 's/template-operator-regular/template-operator-1.0.1/g' ./template.yaml kubectl get crds diff --git a/.github/actions/deploy-template-operator/action.yml b/.github/actions/deploy-template-operator/action.yml index 8e4ba9998a..09e0363701 100644 --- a/.github/actions/deploy-template-operator/action.yml +++ b/.github/actions/deploy-template-operator/action.yml @@ -72,7 +72,15 @@ runs: kustomize edit add patch --path warning_patch.yaml --kind Deployment popd make build-manifests - modulectl create --module-config-file ./module-config.yaml --registry http://localhost:5111 --insecure + echo "name: kyma-project.io/module/template-operator + channel: regular + version: 1.0.1 + security: sec-scanners-config.yaml + defaultCR: ./config/samples/default-sample-cr.yaml + manifest: template-operator.yaml + annotations: + operator.kyma-project.io/doc-url: https://kyma-project.io" >> warning-module-config.yaml + modulectl create --module-config-file ./warning-module-config.yaml --registry http://localhost:5111 --insecure sed -i 's/localhost:5111/k3d-kcp-registry.localhost:5000/g' ./template.yaml kubectl get crds kubectl apply -f template.yaml @@ -93,7 +101,15 @@ runs: kustomize edit add patch --path warning_patch.yaml --kind StatefulSet popd make build-statefulset-manifests - modulectl create --module-config-file ./module-config.yaml --registry http://localhost:5111 --insecure + echo "name: kyma-project.io/module/template-operator + channel: regular + version: 1.0.1 + security: sec-scanners-config.yaml + defaultCR: ./config/samples/default-sample-cr.yaml + manifest: template-operator.yaml + annotations: + operator.kyma-project.io/doc-url: https://kyma-project.io" >> warning-module-config.yaml + modulectl create --module-config-file ./warning-module-config.yaml --registry http://localhost:5111 --insecure sed -i 's/localhost:5111/k3d-kcp-registry.localhost:5000/g' ./template.yaml kubectl get crds kubectl apply -f template.yaml diff --git a/.github/workflows/test-e2e-with-modulereleasemeta.yml b/.github/workflows/test-e2e-with-modulereleasemeta.yml index 7bf9323b90..96c1ce7055 100644 --- a/.github/workflows/test-e2e-with-modulereleasemeta.yml +++ b/.github/workflows/test-e2e-with-modulereleasemeta.yml @@ -70,9 +70,8 @@ jobs: - name: Checkout template-operator uses: actions/checkout@v4 with: - repository: nesmabadr/template-operator + repository: kyma-project/template-operator path: template-operator - ref: update_moduleconfig - name: Get configuration uses: ./lifecycle-manager/.github/actions/get-configuration diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index f0b18342e0..d1d9fe0d29 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -67,9 +67,8 @@ jobs: - name: Checkout template-operator uses: actions/checkout@v4 with: - repository: nesmabadr/template-operator + repository: kyma-project/template-operator path: template-operator - ref: update_moduleconfig - name: Get configuration uses: ./lifecycle-manager/.github/actions/get-configuration