From ac6599a1fc500142317f07af44617821242bacc4 Mon Sep 17 00:00:00 2001 From: Isaac Date: Thu, 30 Jan 2025 18:03:47 +0100 Subject: [PATCH 01/12] Update dependencies --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5f60493d..25c0f077 100644 --- a/go.mod +++ b/go.mod @@ -120,7 +120,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.31.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/net v0.27.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect diff --git a/go.sum b/go.sum index e79bafaf..6f9d66e6 100644 --- a/go.sum +++ b/go.sum @@ -404,8 +404,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 4ae877b8e0a94cf6dcec7a9412fd18f290e1e4d8 Mon Sep 17 00:00:00 2001 From: Isaac Date: Fri, 31 Jan 2025 12:43:20 +0100 Subject: [PATCH 02/12] Add Konflux missing labels on operator's image --- build/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/Dockerfile b/build/Dockerfile index 8453e49e..e0315956 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -18,6 +18,14 @@ COPY --from=builder /workdir/build/_output/bin/deployment-validation-operator ${ COPY build/bin /usr/local/bin RUN /usr/local/bin/user_setup +LABEL name="deployment-validation-operator" \ + summary="Deployment Validation Operator for OpenShift" \ + description="Deployment Validation Operator for OpenShift" \ + com.redhat.component="deployment-validation-operator-container" \ + io.k8s.display-name="Deployment Validation Operator" \ + io.k8s.description="Deployment Validation Operator for OpenShift" \ + io.openshift.tags = "dvo,deployment-validation-operator" + ENTRYPOINT ["/usr/local/bin/entrypoint"] USER ${USER_UID} From f29c5368a365556a202f6138d23d1dcfd1638da1 Mon Sep 17 00:00:00 2001 From: Isaac Date: Fri, 31 Jan 2025 12:55:07 +0100 Subject: [PATCH 03/12] Fix typo --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index e0315956..e2e317fb 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -24,7 +24,7 @@ LABEL name="deployment-validation-operator" \ com.redhat.component="deployment-validation-operator-container" \ io.k8s.display-name="Deployment Validation Operator" \ io.k8s.description="Deployment Validation Operator for OpenShift" \ - io.openshift.tags = "dvo,deployment-validation-operator" + io.openshift.tags="dvo,deployment-validation-operator" ENTRYPOINT ["/usr/local/bin/entrypoint"] From 12a4d25ecb59fe4d9868d2ec28694af5560a1f42 Mon Sep 17 00:00:00 2001 From: Isaac Date: Fri, 31 Jan 2025 13:40:54 +0100 Subject: [PATCH 04/12] Add Konflux needed annotations --- konflux-ci/bundle/metadata/annotations.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/konflux-ci/bundle/metadata/annotations.yaml b/konflux-ci/bundle/metadata/annotations.yaml index 7831d323..5ba2a4cb 100644 --- a/konflux-ci/bundle/metadata/annotations.yaml +++ b/konflux-ci/bundle/metadata/annotations.yaml @@ -8,3 +8,15 @@ annotations: operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0+git operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: unknown +# These annotations are needed in order to release on Konflux + features.operators.openshift.io/cnf: false + features.operators.openshift.io/cni: false + features.operators.openshift.io/csi: false + features.operators.openshift.io/disconnected: true + features.operators.openshift.io/fips-compliant: true + features.operators.openshift.io/proxy-aware: true + features.operators.openshift.io/tls-profiles: false + features.operators.openshift.io/token-auth-aws: false + features.operators.openshift.io/token-auth-azure: false + features.operators.openshift.io/token-auth-gcp: false + operators.openshift.io/valid-subscription: none From 50c47d3099ff3ab18c17b8dd540e430bec1da917 Mon Sep 17 00:00:00 2001 From: Isaac Date: Fri, 31 Jan 2025 13:41:10 +0100 Subject: [PATCH 05/12] Add missing label to bundle image --- build/Dockerfile | 1 + konflux-ci/bundle/bundle.Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/build/Dockerfile b/build/Dockerfile index e2e317fb..21480732 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -18,6 +18,7 @@ COPY --from=builder /workdir/build/_output/bin/deployment-validation-operator ${ COPY build/bin /usr/local/bin RUN /usr/local/bin/user_setup +# These labels are needed in order to release on Konflux LABEL name="deployment-validation-operator" \ summary="Deployment Validation Operator for OpenShift" \ description="Deployment Validation Operator for OpenShift" \ diff --git a/konflux-ci/bundle/bundle.Dockerfile b/konflux-ci/bundle/bundle.Dockerfile index 87f50303..e222f183 100644 --- a/konflux-ci/bundle/bundle.Dockerfile +++ b/konflux-ci/bundle/bundle.Dockerfile @@ -9,6 +9,7 @@ LABEL com.redhat.component="deployment-validation-operator-bundle-container" \ summary="Deployment Validation Operator for OpenShift" \ io.openshift.expose-services="" \ io.k8s.display-name="Deployment Validation Operator Bundle" \ + io.k8s.description="Deployment Validation Operator Bundle for OpenShift" \ maintainer="['dvo-owners@redhat.com']" \ description="Deployment Validation Operator for OpenShift" \ com.redhat.delivery.operator.bundle=true \ From 876d2a047138f1fca1969bc895df5ed436f274e3 Mon Sep 17 00:00:00 2001 From: Isaac Date: Tue, 4 Feb 2025 17:16:48 +0100 Subject: [PATCH 06/12] Test fix annotation value to pass CI --- konflux-ci/bundle/metadata/annotations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/konflux-ci/bundle/metadata/annotations.yaml b/konflux-ci/bundle/metadata/annotations.yaml index 5ba2a4cb..25e576a9 100644 --- a/konflux-ci/bundle/metadata/annotations.yaml +++ b/konflux-ci/bundle/metadata/annotations.yaml @@ -10,7 +10,7 @@ annotations: operators.operatorframework.io.metrics.project_layout: unknown # These annotations are needed in order to release on Konflux features.operators.openshift.io/cnf: false - features.operators.openshift.io/cni: false + features.operators.openshift.io/cni: "false" features.operators.openshift.io/csi: false features.operators.openshift.io/disconnected: true features.operators.openshift.io/fips-compliant: true From 5564f9159c8b4197944ab215eeccf29c26a34ffc Mon Sep 17 00:00:00 2001 From: Isaac Date: Thu, 6 Feb 2025 09:39:08 +0100 Subject: [PATCH 07/12] Fix image ref as for Konflux to unique identify the build container image --- ...eployment-validation-operator.clusterserviceversion.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml index 2ae61c27..36748c93 100644 --- a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml +++ b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml @@ -6,7 +6,7 @@ metadata: capabilities: Basic Install categories: Application Runtime, Monitoring, Security certified: "false" - containerImage: quay.io/deployment-validation-operator/dv-operator:0.7.8 + containerImage: quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator/deployment-validation-operator createdAt: 2024-11-27T00:00:00Z description: The deployment validation operator operators.operatorframework.io/builder: operator-sdk-v1.31.0+git @@ -93,7 +93,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/deployment-validation-operator/dv-operator:0.7.8 + image: quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator/deployment-validation-operator@sha256:0e312d3edc28b931b721eb5ddc59feea4f9141707925224f6b936401b479b4b1 imagePullPolicy: Always name: deployment-validation-operator ports: @@ -160,7 +160,7 @@ spec: - name: repository url: https://github.com/app-sre/deployment-validation-operator - name: containerImage - url: https://quay.io/deployment-validation-operator/dv-operator:0.7.8 + url: quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator/deployment-validation-operator maintainers: - name: Red Hat email: dvo-owners@redhat.com From e591d92b6788dd5e52639e93e50093b923c67ca1 Mon Sep 17 00:00:00 2001 From: Isaac Date: Thu, 6 Feb 2025 10:16:29 +0100 Subject: [PATCH 08/12] Test annotation from metadata to bundle's CSV --- .../deployment-validation-operator.clusterserviceversion.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml index 36748c93..1568519d 100644 --- a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml +++ b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml @@ -14,6 +14,7 @@ metadata: repository: https://github.com/app-sre/deployment-validation-operator support: Best Effort ignore-check.kube-linter.io/minimum-three-replicas: "This deployment uses 1 pod as currently replicating does not replicate metric data causing installation issues" + features.operators.openshift.io/cni: false name: deployment-validation-operator.v0.7.8 spec: description: | From 0d02fa1bdf970f785a2d3338370bc8170307440f Mon Sep 17 00:00:00 2001 From: Isaac Date: Thu, 6 Feb 2025 10:27:09 +0100 Subject: [PATCH 09/12] Test annotation from metadata to bundle's CSV --- .../deployment-validation-operator.clusterserviceversion.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml index 1568519d..f7994a05 100644 --- a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml +++ b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml @@ -14,7 +14,7 @@ metadata: repository: https://github.com/app-sre/deployment-validation-operator support: Best Effort ignore-check.kube-linter.io/minimum-three-replicas: "This deployment uses 1 pod as currently replicating does not replicate metric data causing installation issues" - features.operators.openshift.io/cni: false + features.operators.openshift.io/cni: "false" name: deployment-validation-operator.v0.7.8 spec: description: | From 5c3ec39cc7c55f450181310513bf5ea7561c3fef Mon Sep 17 00:00:00 2001 From: Isaac Date: Thu, 6 Feb 2025 10:48:03 +0100 Subject: [PATCH 10/12] Trigger a new change on the bundle image --- konflux-ci/bundle/metadata/annotations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/konflux-ci/bundle/metadata/annotations.yaml b/konflux-ci/bundle/metadata/annotations.yaml index 25e576a9..5ba2a4cb 100644 --- a/konflux-ci/bundle/metadata/annotations.yaml +++ b/konflux-ci/bundle/metadata/annotations.yaml @@ -10,7 +10,7 @@ annotations: operators.operatorframework.io.metrics.project_layout: unknown # These annotations are needed in order to release on Konflux features.operators.openshift.io/cnf: false - features.operators.openshift.io/cni: "false" + features.operators.openshift.io/cni: false features.operators.openshift.io/csi: false features.operators.openshift.io/disconnected: true features.operators.openshift.io/fips-compliant: true From c1cea9d189fef4dbb8503b788ddec1034ab0e389 Mon Sep 17 00:00:00 2001 From: Isaac Date: Thu, 6 Feb 2025 11:06:01 +0100 Subject: [PATCH 11/12] Add missing annotations on ClusterServiceVersion manifest --- ...nt-validation-operator.clusterserviceversion.yaml | 10 ++++++++++ konflux-ci/bundle/metadata/annotations.yaml | 12 ------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml index f7994a05..df7c5004 100644 --- a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml +++ b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml @@ -14,7 +14,17 @@ metadata: repository: https://github.com/app-sre/deployment-validation-operator support: Best Effort ignore-check.kube-linter.io/minimum-three-replicas: "This deployment uses 1 pod as currently replicating does not replicate metric data causing installation issues" + features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "false" + features.operators.openshift.io/csi: "false" + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "true" + features.operators.openshift.io/proxy-aware: "true" + features.operators.openshift.io/tls-profiles: "false" + features.operators.openshift.io/token-auth-aws: "false" + features.operators.openshift.io/token-auth-azure: "false" + features.operators.openshift.io/token-auth-gcp: "false" + operators.openshift.io/valid-subscription: none name: deployment-validation-operator.v0.7.8 spec: description: | diff --git a/konflux-ci/bundle/metadata/annotations.yaml b/konflux-ci/bundle/metadata/annotations.yaml index 5ba2a4cb..7831d323 100644 --- a/konflux-ci/bundle/metadata/annotations.yaml +++ b/konflux-ci/bundle/metadata/annotations.yaml @@ -8,15 +8,3 @@ annotations: operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0+git operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: unknown -# These annotations are needed in order to release on Konflux - features.operators.openshift.io/cnf: false - features.operators.openshift.io/cni: false - features.operators.openshift.io/csi: false - features.operators.openshift.io/disconnected: true - features.operators.openshift.io/fips-compliant: true - features.operators.openshift.io/proxy-aware: true - features.operators.openshift.io/tls-profiles: false - features.operators.openshift.io/token-auth-aws: false - features.operators.openshift.io/token-auth-azure: false - features.operators.openshift.io/token-auth-gcp: false - operators.openshift.io/valid-subscription: none From 41ad2381371b457fc6e900fa8a2fb09a726e4efe Mon Sep 17 00:00:00 2001 From: Isaac Date: Thu, 6 Feb 2025 14:46:01 +0100 Subject: [PATCH 12/12] Remove unneeded label --- .../deployment-validation-operator.clusterserviceversion.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml index df7c5004..6b42786a 100644 --- a/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml +++ b/konflux-ci/bundle/manifests/deployment-validation-operator.clusterserviceversion.yaml @@ -24,7 +24,6 @@ metadata: features.operators.openshift.io/token-auth-aws: "false" features.operators.openshift.io/token-auth-azure: "false" features.operators.openshift.io/token-auth-gcp: "false" - operators.openshift.io/valid-subscription: none name: deployment-validation-operator.v0.7.8 spec: description: |