Reducing Konflux trigger and bumping catalog RC

netobserv · Jan 9, 2025 · ca1a559 · ca1a559
1 parent 47b9d0f
commit ca1a559
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 16 deletions.
diff --git a/.tekton/fbc-v-4-12-pull-request.yaml b/.tekton/fbc-v-4-12-pull-request.yaml
@@ -14,7 +14,6 @@ metadata:
       "catalog/***".pathChanged() ||
       "./requirements.txt".pathChanged() ||
       "hack/update-build.sh".pathChanged() ||
-      "hack/bundle_digest.sh".pathChanged() ||
       "hack/patch_catalog.py".pathChanged() ||
       "hack/patch_csv.py".pathChanged())
   creationTimestamp: null
@@ -37,7 +36,9 @@ spec:
   - name: dockerfile
     value: catalog.Dockerfile.downstream
   - name: opm-image
-    value: registry.redhat.io/openshift4/ose-operator-registry:v4.12    
+    value: registry.redhat.io/openshift4/ose-operator-registry:v4.12
+  - name: build-platforms
+    value: ["linux/x86_64"]
   pipelineRef:
     name: build-fbc-pipeline
   workspaces:

diff --git a/.tekton/fbc-v4-14-pull-request.yaml b/.tekton/fbc-v4-14-pull-request.yaml
@@ -13,7 +13,6 @@ metadata:
       "catalog.Dockerfile.downstream".pathChanged() ||
       "catalog/***".pathChanged() ||
       "hack/update-build.sh".pathChanged() ||
-      "hack/bundle_digest.sh".pathChanged() ||
       "hack/patch_catalog.py".pathChanged() ||
       "hack/patch_csv.py".pathChanged())
   creationTimestamp: null
@@ -37,6 +36,8 @@ spec:
     value: catalog.Dockerfile.downstream
   - name: opm-image
     value: registry.redhat.io/openshift4/ose-operator-registry:v4.14
+  - name: build-platforms
+    value: ["linux/x86_64"]
   pipelineRef:
     name: build-fbc-pipeline
   workspaces:

diff --git a/.tekton/fbc-v4-15-pull-request.yaml b/.tekton/fbc-v4-15-pull-request.yaml
@@ -13,7 +13,6 @@ metadata:
       "catalog.Dockerfile.downstream".pathChanged() ||
       "catalog/***".pathChanged() ||
       "hack/update-build.sh".pathChanged() ||
-      "hack/bundle_digest.sh".pathChanged() ||
       "hack/patch_catalog.py".pathChanged() ||
       "hack/patch_csv.py".pathChanged())
   creationTimestamp: null
@@ -37,6 +36,8 @@ spec:
     value: catalog.Dockerfile.downstream
   - name: opm-image
     value: registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.15
+  - name: build-platforms
+    value: ["linux/x86_64"]
   pipelineRef:
     name: build-fbc-pipeline
   workspaces:

diff --git a/.tekton/fbc-v4-16-pull-request.yaml b/.tekton/fbc-v4-16-pull-request.yaml
@@ -13,7 +13,6 @@ metadata:
       "catalog.Dockerfile.downstream".pathChanged() ||
       "catalog/***".pathChanged() ||
       "hack/update-build.sh".pathChanged() ||
-      "hack/bundle_digest.sh".pathChanged() ||
       "hack/patch_catalog.py".pathChanged() ||
       "hack/patch_csv.py".pathChanged())
   creationTimestamp: null
@@ -37,6 +36,8 @@ spec:
     value: catalog.Dockerfile.downstream
   - name: opm-image
     value: registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16
+  - name: build-platforms
+    value: ["linux/x86_64"]
   pipelineRef:
     name: build-fbc-pipeline
   workspaces:

diff --git a/.tekton/fbc-v4-17-pull-request.yaml b/.tekton/fbc-v4-17-pull-request.yaml
@@ -13,7 +13,6 @@ metadata:
       "catalog.Dockerfile.downstream".pathChanged() ||
       "catalog/***".pathChanged() ||
       "hack/update-build.sh".pathChanged() ||
-      "hack/bundle_digest.sh".pathChanged() ||
       "hack/patch_catalog.py".pathChanged() ||
       "hack/patch_csv.py".pathChanged())
   creationTimestamp: null
@@ -40,6 +39,8 @@ spec:
     value: catalog.Dockerfile.downstream
   - name: opm-image
     value: registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17
+  - name: build-platforms
+    value: ["linux/x86_64"]
   pipelineRef:
     name: build-fbc-pipeline
   workspaces:

diff --git a/.tekton/network-observability-operator-bundle-pull-request.yaml b/.tekton/network-observability-operator-bundle-pull-request.yaml
@@ -13,7 +13,6 @@ metadata:
       "bundle/***".pathChanged() ||
       "./requirements.txt".pathChanged() ||
       "hack/update-build.sh".pathChanged() ||
-      "hack/container_digest.sh".pathChanged() ||
       "hack/patch_csv.py".pathChanged())
   creationTimestamp: null
   labels:

diff --git a/.tekton/network-observability-operator-fbc-pull-request.yaml b/.tekton/network-observability-operator-fbc-pull-request.yaml
@@ -13,7 +13,6 @@ metadata:
       "catalog/***".pathChanged() ||
       "./requirements.txt".pathChanged() ||
       "hack/update-build.sh".pathChanged() ||
-      "hack/bundle_digest.sh".pathChanged() ||
       "hack/patch_catalog.py".pathChanged() ||
       "hack/patch_csv.py".pathChanged())
   creationTimestamp: null
@@ -35,6 +34,8 @@ spec:
     value: 5d
   - name: dockerfile
     value: ./catalog.Dockerfile.downstream
+  - name: build-platforms
+    value: ["linux/x86_64"]
   pipelineRef:
     name: build-fbc-pipeline
   workspaces:

diff --git a/.tekton/network-observability-operator-pull-request.yaml b/.tekton/network-observability-operator-pull-request.yaml
@@ -13,15 +13,12 @@ metadata:
       "controllers/***".pathChanged() ||
       "Dockerfile.downstream".pathChanged() ||
       "docs/***".pathChanged() ||
-      "go.mod".pathChanged() ||
-      "go.sum".pathChanged() ||
       "hack/update-build.sh".pathChanged() ||
       "LICENSE".pathChanged() ||
       "main.go".pathChanged() ||
       "Makefile".pathChanged() ||
       "manifests/***".pathChanged() ||
-      "pkg/***".pathChanged() ||
-      "vendor/***".pathChanged())
+      "pkg/***".pathChanged())
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: netobserv-operator
@@ -41,5 +38,7 @@ spec:
     value: 5d
   - name: dockerfile
     value: ./Dockerfile.downstream
+  - name: build-platforms
+    value: ["linux/x86_64"]
   pipelineRef:
     name: build-pipeline
diff --git a/catalog/index.yaml b/catalog/index.yaml
@@ -34,7 +34,7 @@ entries:
   replaces: network-observability-operator.v1.6.1
 - name: network-observability-operator.v1.7.0
   replaces: network-observability-operator.v1.6.2
-- name: network-observability-operator.v1.7.1
+- name: network-observability-operator.v1.8.0
   replaces: network-observability-operator.v1.7.0
 ---
 entries:

diff --git a/catalog/rc.yaml b/catalog/rc.yaml
@@ -1,6 +1,6 @@
 image:
   registry.redhat.io/network-observability/network-observability-operator-bundle@sha256:652c4315efe070dd4e3b91af036e9baa7bdeb9c6f1864b94b99f7795cfc5db88
-name: network-observability-operator.v1.7.1
+name: network-observability-operator.v1.8.0
 package: netobserv-operator
 properties:
 - type: olm.gvk
@@ -21,7 +21,7 @@ properties:
 - type: olm.package
   value:
     packageName: netobserv-operator
-    version: 1.7.1
+    version: 1.8.0
 - type: olm.csv.metadata
   value:
     annotations:

diff --git a/hack/update-build.sh b/hack/update-build.sh
@@ -7,7 +7,7 @@ echo "Updating container file"
 : "${CONTAINER_FILE:=./Dockerfile}"
 : "${BUNDLE_CONTAINER_FILE:=./bundle.Dockerfile}"
 : "${CATALOG_CONTAINER_FILE:=./catalog.Dockerfile}"
-: "${TARGET_VERSION:=1.7.1}"
+: "${TARGET_VERSION:=1.8.0}"
 : "${REPLACE_VERSION:=1.7.0}"