From 7466d89118c289bc278d9dd5e06603ed92bb8e37 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 3 Feb 2025 16:35:26 +0100 Subject: [PATCH 1/9] update Signed-off-by: Coleen Iona Quadros --- ...atorium-operator-acm-213-pull-request.yaml | 26 +++++++++---------- .../observatorium-operator-acm-213-push.yaml | 26 +++++++++---------- renovate.json | 2 -- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/.tekton/observatorium-operator-acm-213-pull-request.yaml b/.tekton/observatorium-operator-acm-213-pull-request.yaml index ea64bfd..119b8be 100644 --- a/.tekton/observatorium-operator-acm-213-pull-request.yaml +++ b/.tekton/observatorium-operator-acm-213-pull-request.yaml @@ -145,7 +145,7 @@ spec: - name: name value: init - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:90dda596d44b3f861889da2fba161dff34c6116fe76c3989e3f84262ea0f29cd + value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:4c6712db9419461b8c8a39523c012cb0dc061fb58563bb9170b3777d74f54659 - name: kind value: task resolver: bundles @@ -166,7 +166,7 @@ spec: - name: name value: git-clone-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:f72fcca6732516339d55ac5f01660e287968e64e857a40a8608db27e298b5126 + value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:36d98ab04eaac2c964149060c773ac20df42f91527db6c40b7b250e6eeff5821 - name: kind value: task resolver: bundles @@ -195,7 +195,7 @@ spec: - name: name value: prefetch-dependencies-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:994f816e36ac832f4020647afd69223a015c84c503f925013c573fed52f05420 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:593714c3b029ef748a38d6cefea122294df2390172d7694b720be62bb416ff59 - name: kind value: task resolver: bundles @@ -243,7 +243,7 @@ spec: - name: name value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.3@sha256:6c2c433ef94187e9aa73575004029cd6e2bbbdeefc7f90070595fb20f77bc121 + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.3@sha256:e7e029e27a415bde652791f251f904b347f0c197ce0a6665e0a7e82d40ae04d8 - name: kind value: task resolver: bundles @@ -272,7 +272,7 @@ spec: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:479775c8655d815fb515aeb97efc0e64284a8520c452754981970900b937a393 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:be5e5d4ef43f14f6dc3f8da4df52b3e3b2529f9d64e706471b0317b5a07a9046 - name: kind value: task resolver: bundles @@ -296,7 +296,7 @@ spec: - name: name value: source-build-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:75e882bf1619dd45a4043060ce42a6ad3ce781264ade5b7f66a1d994ee159126 + value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:18241f95266a5e4316449f25a600f0f035d32a81c72ecd609a7e886de1843163 - name: kind value: task resolver: bundles @@ -322,7 +322,7 @@ spec: - name: name value: deprecated-image-check - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:650330fde0773f73f6bac77ae573031c44c79165d9503b0d5ec1db3e6ef981d7 + value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:241f87f75a6e4303fbd64b32ba1715d76fe3805c48a6c21829e6a564bcc3a576 - name: kind value: task resolver: bundles @@ -344,7 +344,7 @@ spec: - name: name value: clair-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:907f11c67b0330480cbf85c23b1085acc5a049ab90af980169251860a3d97ef7 + value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:f636f2cbe91d9d4d9685a38c8bc680a36e17f568ec0e60a93da82d1284b488c5 - name: kind value: task resolver: bundles @@ -390,7 +390,7 @@ spec: - name: name value: sast-snyk-check-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:af93b35e6e71a6ff7f3785ad8d8497b11204a5c0c33ab1a78b44f9d43f49c7a5 + value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:ed777841052e05c61abc9fc66f6aad65f113bad719eeb2e04ce490fc175aaebe - name: kind value: task resolver: bundles @@ -412,7 +412,7 @@ spec: - name: name value: clamav-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:c12e7a774bb07ad2796c01071b0dc0f199111b0ee99c45b55fa599e23b200bae + value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:0db068e8a59612472a2483f5113893d0c5c9102e9ad7647d9a4789360e5bc2dc - name: kind value: task resolver: bundles @@ -432,7 +432,7 @@ spec: - name: name value: apply-tags - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:2c2d88c07623b2d25163994ded6e9f29205ea5bbab090f4c86379739940028b9 + value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:fa7aa88ffe01eeeaa07c8720b27e50e27f6f136ef33595efaa16a0eb4598ea02 - name: kind value: task resolver: bundles @@ -455,7 +455,7 @@ spec: - name: name value: push-dockerfile-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:98ccae6ac132ab837fc51a70514be5fca656e09d6d4ad93230bd10f0119258aa + value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:fcd9016f1cd5d1085b5e823cdf04a4e77ce80f67d0990af7853e70755aa25d54 - name: kind value: task resolver: bundles @@ -472,7 +472,7 @@ spec: - name: name value: rpms-signature-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:39cd56ffa26ff5edfd5bf9b61e902cae35a345c078cd9dcbc0737d30f3ce5ef1 + value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:3bf6d1bcd57af1095b06b4c489f965551364b1f1f72a807de9cab3c23142dca5 - name: kind value: task resolver: bundles diff --git a/.tekton/observatorium-operator-acm-213-push.yaml b/.tekton/observatorium-operator-acm-213-push.yaml index bc431aa..53712bb 100644 --- a/.tekton/observatorium-operator-acm-213-push.yaml +++ b/.tekton/observatorium-operator-acm-213-push.yaml @@ -142,7 +142,7 @@ spec: - name: name value: init - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:90dda596d44b3f861889da2fba161dff34c6116fe76c3989e3f84262ea0f29cd + value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:4c6712db9419461b8c8a39523c012cb0dc061fb58563bb9170b3777d74f54659 - name: kind value: task resolver: bundles @@ -163,7 +163,7 @@ spec: - name: name value: git-clone-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:f72fcca6732516339d55ac5f01660e287968e64e857a40a8608db27e298b5126 + value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:36d98ab04eaac2c964149060c773ac20df42f91527db6c40b7b250e6eeff5821 - name: kind value: task resolver: bundles @@ -192,7 +192,7 @@ spec: - name: name value: prefetch-dependencies-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:994f816e36ac832f4020647afd69223a015c84c503f925013c573fed52f05420 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:593714c3b029ef748a38d6cefea122294df2390172d7694b720be62bb416ff59 - name: kind value: task resolver: bundles @@ -240,7 +240,7 @@ spec: - name: name value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.3@sha256:6c2c433ef94187e9aa73575004029cd6e2bbbdeefc7f90070595fb20f77bc121 + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.3@sha256:e7e029e27a415bde652791f251f904b347f0c197ce0a6665e0a7e82d40ae04d8 - name: kind value: task resolver: bundles @@ -269,7 +269,7 @@ spec: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:479775c8655d815fb515aeb97efc0e64284a8520c452754981970900b937a393 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:be5e5d4ef43f14f6dc3f8da4df52b3e3b2529f9d64e706471b0317b5a07a9046 - name: kind value: task resolver: bundles @@ -293,7 +293,7 @@ spec: - name: name value: source-build-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:75e882bf1619dd45a4043060ce42a6ad3ce781264ade5b7f66a1d994ee159126 + value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:18241f95266a5e4316449f25a600f0f035d32a81c72ecd609a7e886de1843163 - name: kind value: task resolver: bundles @@ -319,7 +319,7 @@ spec: - name: name value: deprecated-image-check - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:650330fde0773f73f6bac77ae573031c44c79165d9503b0d5ec1db3e6ef981d7 + value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:241f87f75a6e4303fbd64b32ba1715d76fe3805c48a6c21829e6a564bcc3a576 - name: kind value: task resolver: bundles @@ -341,7 +341,7 @@ spec: - name: name value: clair-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:907f11c67b0330480cbf85c23b1085acc5a049ab90af980169251860a3d97ef7 + value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:f636f2cbe91d9d4d9685a38c8bc680a36e17f568ec0e60a93da82d1284b488c5 - name: kind value: task resolver: bundles @@ -387,7 +387,7 @@ spec: - name: name value: sast-snyk-check-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:af93b35e6e71a6ff7f3785ad8d8497b11204a5c0c33ab1a78b44f9d43f49c7a5 + value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:ed777841052e05c61abc9fc66f6aad65f113bad719eeb2e04ce490fc175aaebe - name: kind value: task resolver: bundles @@ -409,7 +409,7 @@ spec: - name: name value: clamav-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:c12e7a774bb07ad2796c01071b0dc0f199111b0ee99c45b55fa599e23b200bae + value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:0db068e8a59612472a2483f5113893d0c5c9102e9ad7647d9a4789360e5bc2dc - name: kind value: task resolver: bundles @@ -429,7 +429,7 @@ spec: - name: name value: apply-tags - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:2c2d88c07623b2d25163994ded6e9f29205ea5bbab090f4c86379739940028b9 + value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:fa7aa88ffe01eeeaa07c8720b27e50e27f6f136ef33595efaa16a0eb4598ea02 - name: kind value: task resolver: bundles @@ -452,7 +452,7 @@ spec: - name: name value: push-dockerfile-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:98ccae6ac132ab837fc51a70514be5fca656e09d6d4ad93230bd10f0119258aa + value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:fcd9016f1cd5d1085b5e823cdf04a4e77ce80f67d0990af7853e70755aa25d54 - name: kind value: task resolver: bundles @@ -469,7 +469,7 @@ spec: - name: name value: rpms-signature-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:39cd56ffa26ff5edfd5bf9b61e902cae35a345c078cd9dcbc0737d30f3ce5ef1 + value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:3bf6d1bcd57af1095b06b4c489f965551364b1f1f72a807de9cab3c23142dca5 - name: kind value: task resolver: bundles diff --git a/renovate.json b/renovate.json index 811bb77..68acab1 100644 --- a/renovate.json +++ b/renovate.json @@ -3,7 +3,5 @@ "github>konflux-ci/mintmaker//config/renovate/renovate.json" ], "baseBranches": ["main", "/^release-\\d+\\.\\d+/"], - "schedule": ["on friday at 2pm"], - "updateNotScheduled": false, "autoApprove": true } From c60c67a7208758f63d1167e9509fe5d31ff390d6 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 3 Feb 2025 17:07:35 +0100 Subject: [PATCH 2/9] source-image Signed-off-by: Coleen Iona Quadros --- .tekton/observatorium-operator-acm-213-pull-request.yaml | 4 ++++ .tekton/observatorium-operator-acm-213-push.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.tekton/observatorium-operator-acm-213-pull-request.yaml b/.tekton/observatorium-operator-acm-213-pull-request.yaml index 119b8be..18f46f1 100644 --- a/.tekton/observatorium-operator-acm-213-pull-request.yaml +++ b/.tekton/observatorium-operator-acm-213-pull-request.yaml @@ -35,6 +35,10 @@ spec: value: . - name: hermetic value: true + - name: prefetch-input + value: '[{"path": ".", "type": "gomod"}]' + - name: build-source-image + value: "true" pipelineSpec: description: | This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization. diff --git a/.tekton/observatorium-operator-acm-213-push.yaml b/.tekton/observatorium-operator-acm-213-push.yaml index 53712bb..501dbb9 100644 --- a/.tekton/observatorium-operator-acm-213-push.yaml +++ b/.tekton/observatorium-operator-acm-213-push.yaml @@ -32,6 +32,10 @@ spec: value: . - name: hermetic value: true + - name: prefetch-input + value: '[{"path": ".", "type": "gomod"}]' + - name: build-source-image + value: "true" pipelineSpec: description: | This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization. From f49d361e659c2d92fe15c8ff40e2582cb4f4138f Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Tue, 4 Feb 2025 15:36:53 +0100 Subject: [PATCH 3/9] source-image Signed-off-by: Coleen Iona Quadros --- .tekton/observatorium-operator-acm-213-pull-request.yaml | 2 +- .tekton/observatorium-operator-acm-213-push.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.tekton/observatorium-operator-acm-213-pull-request.yaml b/.tekton/observatorium-operator-acm-213-pull-request.yaml index 18f46f1..2737ad9 100644 --- a/.tekton/observatorium-operator-acm-213-pull-request.yaml +++ b/.tekton/observatorium-operator-acm-213-pull-request.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "release-2.13" + == "main" creationTimestamp: null labels: appstudio.openshift.io/application: release-acm-213 diff --git a/.tekton/observatorium-operator-acm-213-push.yaml b/.tekton/observatorium-operator-acm-213-push.yaml index 501dbb9..4637bc9 100644 --- a/.tekton/observatorium-operator-acm-213-push.yaml +++ b/.tekton/observatorium-operator-acm-213-push.yaml @@ -7,7 +7,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "release-2.13" + == "main" creationTimestamp: null labels: appstudio.openshift.io/application: release-acm-213 From 3149fde6d480b7a92afc66b74a526a0ef12dc9d1 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Tue, 4 Feb 2025 15:38:46 +0100 Subject: [PATCH 4/9] source-image Signed-off-by: Coleen Iona Quadros --- Containerfile.operator | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile.operator b/Containerfile.operator index de9cacf..2da8c6a 100644 --- a/Containerfile.operator +++ b/Containerfile.operator @@ -33,6 +33,7 @@ ARG VCS_BRANCH LABEL vendor="Observatorium" \ name="observatorium/operator" \ + com.redhat.component="observatorium" \ description="Observatorium Operator" \ io.k8s.display-name="observatorium/operator" \ io.k8s.description="Observatorium Operator" \ From 861810fca672ef27c44b38875e73da933e160e2e Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Wed, 5 Feb 2025 10:27:35 +0100 Subject: [PATCH 5/9] add locutus submodules Signed-off-by: Coleen Iona Quadros --- .gitmodules | 3 +++ .tekton/observatorium-operator-acm-213-pull-request.yaml | 2 +- .tekton/observatorium-operator-acm-213-push.yaml | 2 +- Containerfile.operator | 4 +--- locutus | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 160000 locutus diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..77cc387 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "locutus"] + path = locutus + url = https://github.com/stolostron/locutus diff --git a/.tekton/observatorium-operator-acm-213-pull-request.yaml b/.tekton/observatorium-operator-acm-213-pull-request.yaml index 2737ad9..dbbd3f2 100644 --- a/.tekton/observatorium-operator-acm-213-pull-request.yaml +++ b/.tekton/observatorium-operator-acm-213-pull-request.yaml @@ -36,7 +36,7 @@ spec: - name: hermetic value: true - name: prefetch-input - value: '[{"path": ".", "type": "gomod"}]' + value: '[{"path": ".", "type": "gomod"}, {"path": "locutus/", "type": "gomod"}]' - name: build-source-image value: "true" pipelineSpec: diff --git a/.tekton/observatorium-operator-acm-213-push.yaml b/.tekton/observatorium-operator-acm-213-push.yaml index 4637bc9..d51a779 100644 --- a/.tekton/observatorium-operator-acm-213-push.yaml +++ b/.tekton/observatorium-operator-acm-213-push.yaml @@ -33,7 +33,7 @@ spec: - name: hermetic value: true - name: prefetch-input - value: '[{"path": ".", "type": "gomod"}]' + value: '[{"path": ".", "type": "gomod"}, {"path": "locutus/", "type": "gomod"}]' - name: build-source-image value: "true" pipelineSpec: diff --git a/Containerfile.operator b/Containerfile.operator index 2da8c6a..a8df901 100644 --- a/Containerfile.operator +++ b/Containerfile.operator @@ -9,9 +9,7 @@ COPY . operator/ COPY ./jsonnet/vendor/stolo-configuration/components/ components/ # Build -ADD https://github.com/stolostron/locutus/archive/e1e2a3b29ff27b2f31c272c2bc118f687b9b74b8.tar.gz /workspace/operator/locutus.tar.gz WORKDIR /workspace/operator/locutus -RUN tar -xf /workspace/operator/locutus.tar.gz -C . --strip-components=1 RUN GO111MODULE="on" CGO_ENABLED=1 GOFLAGS="" go build FROM registry.access.redhat.com/ubi9/ubi-minimal:latest @@ -33,7 +31,7 @@ ARG VCS_BRANCH LABEL vendor="Observatorium" \ name="observatorium/operator" \ - com.redhat.component="observatorium" \ + com.redhat.component="observatorium-operator" \ description="Observatorium Operator" \ io.k8s.display-name="observatorium/operator" \ io.k8s.description="Observatorium Operator" \ diff --git a/locutus b/locutus new file mode 160000 index 0000000..e1e2a3b --- /dev/null +++ b/locutus @@ -0,0 +1 @@ +Subproject commit e1e2a3b29ff27b2f31c272c2bc118f687b9b74b8 From c7311ed8f13bdc042a7ab68950524ff6240b6a4c Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Wed, 5 Feb 2025 10:47:58 +0100 Subject: [PATCH 6/9] ec Signed-off-by: Coleen Iona Quadros --- Containerfile.operator | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile.operator b/Containerfile.operator index a8df901..47ca3af 100644 --- a/Containerfile.operator +++ b/Containerfile.operator @@ -31,6 +31,7 @@ ARG VCS_BRANCH LABEL vendor="Observatorium" \ name="observatorium/operator" \ + summary="observatorium-operator" \ com.redhat.component="observatorium-operator" \ description="Observatorium Operator" \ io.k8s.display-name="observatorium/operator" \ @@ -46,7 +47,7 @@ LABEL vendor="Observatorium" \ org.label-schema.vcs-branch=$VCS_BRANCH \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url="https://github.com/observatorium/operator" \ - org.label-schema.vendor="observatorium/operator" \ + org.label-schema.vendor="Red hat, Inc" \ org.label-schema.version=$VERSION ENTRYPOINT ["/locutus", "--renderer=jsonnet", "--renderer.jsonnet.entrypoint=main.jsonnet", "--trigger=resource", "--trigger.resource.config=config.yaml"] From 9336163e40b285554e9c359da826b92a1ef6eed1 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Wed, 5 Feb 2025 11:08:11 +0100 Subject: [PATCH 7/9] tags Signed-off-by: Coleen Iona Quadros --- Containerfile.operator | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile.operator b/Containerfile.operator index 47ca3af..6dd6459 100644 --- a/Containerfile.operator +++ b/Containerfile.operator @@ -34,6 +34,7 @@ LABEL vendor="Observatorium" \ summary="observatorium-operator" \ com.redhat.component="observatorium-operator" \ description="Observatorium Operator" \ + io.openshift.tags="observability" \ io.k8s.display-name="observatorium/operator" \ io.k8s.description="Observatorium Operator" \ maintainer="Observatorium " \ From fcb4ebb39712905d8c61530fda176bd8ff0955d9 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Wed, 5 Feb 2025 14:33:14 +0100 Subject: [PATCH 8/9] labels Signed-off-by: Coleen Iona Quadros --- Containerfile.operator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.operator b/Containerfile.operator index 6dd6459..ae91a86 100644 --- a/Containerfile.operator +++ b/Containerfile.operator @@ -29,7 +29,7 @@ ARG VCS_REF ARG DOCKERFILE_PATH ARG VCS_BRANCH -LABEL vendor="Observatorium" \ +LABEL vendor="Red Hat, Inc" \ name="observatorium/operator" \ summary="observatorium-operator" \ com.redhat.component="observatorium-operator" \ From e8dd7462633dff108a5a4078264cacd99b37914b Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Wed, 5 Feb 2025 15:22:25 +0100 Subject: [PATCH 9/9] cve Signed-off-by: Coleen Iona Quadros --- Containerfile.operator | 3 +-- go.mod | 4 ++-- go.sum | 6 ++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Containerfile.operator b/Containerfile.operator index ae91a86..8ddf51b 100644 --- a/Containerfile.operator +++ b/Containerfile.operator @@ -29,8 +29,7 @@ ARG VCS_REF ARG DOCKERFILE_PATH ARG VCS_BRANCH -LABEL vendor="Red Hat, Inc" \ - name="observatorium/operator" \ +LABEL name="observatorium/operator" \ summary="observatorium-operator" \ com.redhat.component="observatorium-operator" \ description="Observatorium Operator" \ diff --git a/go.mod b/go.mod index 94660c4..7d56611 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/go-logr/logr v0.2.0 // indirect github.com/gobuffalo/flect v0.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.4.3 // indirect + github.com/golang/protobuf v1.5.0 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-jsonnet v0.17.0 // indirect github.com/google/gofuzz v1.1.0 // indirect @@ -55,7 +55,7 @@ require ( golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/appengine v1.6.5 // indirect - google.golang.org/protobuf v1.26.0-rc.1 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect diff --git a/go.sum b/go.sum index 2deef2b..c52c8a0 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,9 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -881,8 +882,9 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1 h1:7QnIQpGRHE5RnLKnESfDoxm2dTapTZua5a0kS0A+VXQ= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=