From bb50495347a0ccbbd4f6be28fd0c2e446f01759b Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sat, 22 Jun 2024 13:54:16 +0200 Subject: [PATCH 1/5] akeleton for skaffold tests --- skaffold.yaml | 13 ++++++++++--- utils/test.sh | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 utils/test.sh diff --git a/skaffold.yaml b/skaffold.yaml index 04043c5..65d4f92 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta5 +apiVersion: skaffold/v4beta9 kind: Config metadata: name: bitwarden-crd-operator @@ -13,5 +13,12 @@ deploy: - name: bitwarden-crd-operator chartPath: charts/bitwarden-crd-operator valuesFiles: - - env/values.yaml - version: v0.13.0 + - ./charts/bitwarden-crd-operator/myvalues.yaml + setValueTemplates: + image.repository: "{{.IMAGE_REPO_ghcr_io_lerentis_bitwarden_crd_operator}}" + image.tag: "{{.IMAGE_TAG_ghcr_io_lerentis_bitwarden_crd_operator}}@{{.IMAGE_DIGEST_ghcr_io_lerentis_bitwarden_crd_operator}}" +test: + - image: ghcr.io/lerentis/bitwarden-crd-operator + custom: + - command: ./utils/test.sh + timeoutSeconds: 60 diff --git a/utils/test.sh b/utils/test.sh new file mode 100644 index 0000000..c0db713 --- /dev/null +++ b/utils/test.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +kubectl apply -f example* + From 20527b348ac3b597507dcc0c2236c1f18129fbe1 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sat, 22 Jun 2024 23:02:09 +0200 Subject: [PATCH 2/5] bump actions/download-artifact in order to fix release pipeline --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93b77bc..616791b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,7 +77,7 @@ jobs: uses: WyriHaximus/github-action-get-previous-tag@v1 - name: Download SBOM from github action - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.ANCHORE_SBOM_ACTION_PRIOR_ARTIFACT }} From baed77e5705edd68ebce0b239abdc232ba4eb57a Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sat, 22 Jun 2024 23:03:52 +0200 Subject: [PATCH 3/5] align examples again --- example.yaml | 2 +- example_dockerlogin.yaml | 2 +- example_template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example.yaml b/example.yaml index c7667c1..d948f10 100644 --- a/example.yaml +++ b/example.yaml @@ -24,7 +24,7 @@ spec: annotations: custom.annotation: is-used --- -apiVersion: "lerentis.uploadfilter24.eu/v1beta6" +apiVersion: "lerentis.uploadfilter24.eu/v1beta7" kind: BitwardenSecret metadata: name: test-scope diff --git a/example_dockerlogin.yaml b/example_dockerlogin.yaml index 767f4cb..29f626b 100644 --- a/example_dockerlogin.yaml +++ b/example_dockerlogin.yaml @@ -1,5 +1,5 @@ --- -apiVersion: "lerentis.uploadfilter24.eu/v1beta6" +apiVersion: "lerentis.uploadfilter24.eu/v1beta7" kind: RegistryCredential metadata: name: test diff --git a/example_template.yaml b/example_template.yaml index 490e145..d47eee9 100644 --- a/example_template.yaml +++ b/example_template.yaml @@ -1,5 +1,5 @@ --- -apiVersion: "lerentis.uploadfilter24.eu/v1beta6" +apiVersion: "lerentis.uploadfilter24.eu/v1beta7" kind: BitwardenTemplate metadata: name: test From 5b445ae668ed89342b1374d355cc805d399f922b Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sun, 23 Jun 2024 00:33:29 +0200 Subject: [PATCH 4/5] still wip --- Dockerfile.test | 15 +++++++++++++++ skaffold.yaml | 17 ++++++++++++----- utils/test.sh | 26 +++++++++++++++++++++++++- 3 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 Dockerfile.test mode change 100644 => 100755 utils/test.sh diff --git a/Dockerfile.test b/Dockerfile.test new file mode 100644 index 0000000..8cac039 --- /dev/null +++ b/Dockerfile.test @@ -0,0 +1,15 @@ +FROM ubuntu:22.04 + +RUN apt-get update && apt-get install -y curl + +RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \ + && mv kubectl /usr/bin/kubectl \ + && chmod +x /usr/bin/kubectl + +ADD example.yaml /example.yaml +ADD example_dockerlogin.yaml /example_dockerlogin.yaml +ADD example_template.yaml /example_template.yaml + +ADD utils/test.sh /test.sh + +ENTRYPOINT [ "/test.sh" ] \ No newline at end of file diff --git a/skaffold.yaml b/skaffold.yaml index 65d4f92..f853794 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -3,10 +3,15 @@ kind: Config metadata: name: bitwarden-crd-operator build: + tagPolicy: + sha256: {} artifacts: - image: ghcr.io/lerentis/bitwarden-crd-operator docker: dockerfile: Dockerfile + - image: integration-test-container + docker: + dockerfile: Dockerfile.test deploy: helm: releases: @@ -17,8 +22,10 @@ deploy: setValueTemplates: image.repository: "{{.IMAGE_REPO_ghcr_io_lerentis_bitwarden_crd_operator}}" image.tag: "{{.IMAGE_TAG_ghcr_io_lerentis_bitwarden_crd_operator}}@{{.IMAGE_DIGEST_ghcr_io_lerentis_bitwarden_crd_operator}}" -test: - - image: ghcr.io/lerentis/bitwarden-crd-operator - custom: - - command: ./utils/test.sh - timeoutSeconds: 60 +verify: + - name: integration-test-container + container: + name: integration-test-container + image: "integration-test-container:a11852f8bb9bf99553238e1fa29206421c72801df5da96ccf9f77ebd069f815f" + executionMode: + kubernetesCluster: {} diff --git a/utils/test.sh b/utils/test.sh old mode 100644 new mode 100755 index c0db713..48b47ae --- a/utils/test.sh +++ b/utils/test.sh @@ -1,4 +1,28 @@ #!/bin/bash -kubectl apply -f example* +for f in /*.yaml +do + echo "applying $f ..." + kubectl apply -f "$f" +done +kubectl get secret test-regcred +if [ $? -ne 0 ]; then + echo "Could not find secret test-regcred" + exit 1 +fi +kubectl get secret test-scope +if [ $? -ne 0 ]; then + echo "Could not find secret test-scope" + exit 1 +fi +kubectl get secret test-secret +if [ $? -ne 0 ]; then + echo "Could not find secret test-secret" + exit 1 +fi +kubectl get secret test-template +if [ $? -ne 0 ]; then + echo "Could not find secret test-template" + exit 1 +fi \ No newline at end of file From fb342b36fcf21e9c2df99dcd9fa81d8232d51b4e Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sat, 29 Jun 2024 23:27:42 +0200 Subject: [PATCH 5/5] simplifying skaffold tests --- Dockerfile.test | 15 --------------- skaffold.yaml | 46 ++++++++++++++++++++++++++++++++++++---------- utils/test.sh | 28 ---------------------------- 3 files changed, 36 insertions(+), 53 deletions(-) delete mode 100644 Dockerfile.test delete mode 100755 utils/test.sh diff --git a/Dockerfile.test b/Dockerfile.test deleted file mode 100644 index 8cac039..0000000 --- a/Dockerfile.test +++ /dev/null @@ -1,15 +0,0 @@ -FROM ubuntu:22.04 - -RUN apt-get update && apt-get install -y curl - -RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \ - && mv kubectl /usr/bin/kubectl \ - && chmod +x /usr/bin/kubectl - -ADD example.yaml /example.yaml -ADD example_dockerlogin.yaml /example_dockerlogin.yaml -ADD example_template.yaml /example_template.yaml - -ADD utils/test.sh /test.sh - -ENTRYPOINT [ "/test.sh" ] \ No newline at end of file diff --git a/skaffold.yaml b/skaffold.yaml index f853794..9629535 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -9,9 +9,6 @@ build: - image: ghcr.io/lerentis/bitwarden-crd-operator docker: dockerfile: Dockerfile - - image: integration-test-container - docker: - dockerfile: Dockerfile.test deploy: helm: releases: @@ -22,10 +19,39 @@ deploy: setValueTemplates: image.repository: "{{.IMAGE_REPO_ghcr_io_lerentis_bitwarden_crd_operator}}" image.tag: "{{.IMAGE_TAG_ghcr_io_lerentis_bitwarden_crd_operator}}@{{.IMAGE_DIGEST_ghcr_io_lerentis_bitwarden_crd_operator}}" -verify: - - name: integration-test-container - container: - name: integration-test-container - image: "integration-test-container:a11852f8bb9bf99553238e1fa29206421c72801df5da96ccf9f77ebd069f815f" - executionMode: - kubernetesCluster: {} + hooks: + after: + - host: + command: + - kubectl + - apply + - -f + - ./example*.yaml + - host: + command: + - sleep + - '5' + - host: + command: + - kubectl + - get + - secret + - test-regcred + - host: + command: + - kubectl + - get + - secret + - test-scope + - host: + command: + - kubectl + - get + - secret + - test-secret + - host: + command: + - kubectl + - get + - secret + - test-template diff --git a/utils/test.sh b/utils/test.sh deleted file mode 100755 index 48b47ae..0000000 --- a/utils/test.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -for f in /*.yaml -do - echo "applying $f ..." - kubectl apply -f "$f" -done - -kubectl get secret test-regcred -if [ $? -ne 0 ]; then - echo "Could not find secret test-regcred" - exit 1 -fi -kubectl get secret test-scope -if [ $? -ne 0 ]; then - echo "Could not find secret test-scope" - exit 1 -fi -kubectl get secret test-secret -if [ $? -ne 0 ]; then - echo "Could not find secret test-secret" - exit 1 -fi -kubectl get secret test-template -if [ $? -ne 0 ]; then - echo "Could not find secret test-template" - exit 1 -fi \ No newline at end of file