Merge remote-tracking branch 'common-upstream/main' into common-automatic-update

mbaldessari · mbaldessari · commit ecf85712b3b4 · 2023-08-14T14:45:17.000+02:00
diff --git a/common/Makefile b/common/Makefile
@@ -67,6 +67,9 @@ load-iib: ## CI target to install Index Image Bundles
 		for IIB in $(shell echo $(INDEX_IMAGES) | tr ',' '\n'); do \
 			INDEX_IMAGE="$${IIB}" ansible-playbook common/ansible/playbooks/iib-ci/iib-ci.yaml; \
 		done; \
+	else \
+		echo "No INDEX_IMAGES defined. Bailing out"; \
+		exit 1; \
 	fi
 
 
diff --git a/common/ansible/roles/iib_ci/tasks/fetch-operator-images.yml b/common/ansible/roles/iib_ci/tasks/fetch-operator-images.yml
@@ -20,6 +20,9 @@
     oc get packagemanifests -l "catalog=iib-{{ iib }}" --field-selector "metadata.name={{ item }}" \
       -o jsonpath="{.items[0].status.channels[?(@.name==\"{{ default_channel }}\")].currentCSVDesc.relatedImages}"
   register: related_images_raw
+  retries: 5
+  delay: 10
+  until: related_images_raw is not failed
 
 - name: Set related_images fact
   ansible.builtin.set_fact:
@@ -43,7 +46,7 @@
 - name: Read the operator bundle from the default channel
   ansible.builtin.shell: |
     set -o pipefail
-    podman run -it --rm "{{ iib_image }}" alpha list channels /configs "{{ item }}" | grep --word-regexp "{{ default_channel }}" | awk '{ print $3 }'
+    podman run -it --rm "{{ iib_image }}" alpha list channels /configs "{{ item }}" | grep -E "(\s){{ default_channel }}(\s)" | awk '{ print $3 }'
   register: bundle_channel_raw
 
 - name: Set bundle fact
diff --git a/common/ansible/roles/iib_ci/tasks/setup-internal-registry.yml b/common/ansible/roles/iib_ci/tasks/setup-internal-registry.yml
@@ -45,7 +45,7 @@
 
 - name: Set registry allowedRegistries
   ansible.builtin.shell: >
-    oc patch image.config.openshift.io/cluster --patch "{\"spec\":{\"registrySources\":{\"allowedRegistries\":[ \"registry.stage.redhat.io\", \"registry.access.redhat.com\", \"registry.connect.redhat.com\", \"ghcr.io\", \"gcr.io\", \"quay.io\", \"registry.redhat.io\",
+    oc patch image.config.openshift.io/cluster --patch "{\"spec\":{\"registrySources\":{\"allowedRegistries\":[ \"registry.stage.redhat.io\", \"registry.access.redhat.com\", \"registry.connect.redhat.com\", \"ghcr.io\", \"gcr.io\", \"quay.io\", \"registry.redhat.io\", \"docker.io\",
     \"registry-proxy.engineering.redhat.com\", \"image-registry.openshift-image-registry.svc:5000\", \"{{ registry_route }}\"]}}}" --type=merge
 
 - name: Set registry insecureRegistries
diff --git a/common/hashicorp-vault/Chart.yaml b/common/hashicorp-vault/Chart.yaml
@@ -6,5 +6,5 @@ name: hashicorp-vault
 version: 0.0.1
 dependencies:
   - name: vault
-    version: "0.24.1"
+    version: "0.25.0"
     repository: "https://helm.releases.hashicorp.com"
diff --git a/common/hashicorp-vault/charts/vault-0.24.1.tgz b/common/hashicorp-vault/charts/vault-0.24.1.tgz
diff --git a/common/hashicorp-vault/charts/vault-0.25.0.tgz b/common/hashicorp-vault/charts/vault-0.25.0.tgz
diff --git a/common/hashicorp-vault/values.yaml b/common/hashicorp-vault/values.yaml
@@ -49,4 +49,4 @@ vault:
         termination: "reencrypt"
     image:
       repository: "registry.connect.redhat.com/hashicorp/vault"
-      tag: "1.13.1-ubi"
+      tag: "1.14.0-ubi"
diff --git a/common/tests/hashicorp-vault-industrial-edge-factory.expected.yaml b/common/tests/hashicorp-vault-industrial-edge-factory.expected.yaml
@@ -6,7 +6,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -18,7 +18,7 @@ metadata:
   name: hashicorp-vault-config
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -42,7 +42,7 @@ kind: ClusterRoleBinding
 metadata:
   name: hashicorp-vault-server-binding
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -63,7 +63,7 @@ metadata:
   name: hashicorp-vault-internal
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -95,7 +95,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -126,7 +126,7 @@ metadata:
   name: hashicorp-vault-ui
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault-ui
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -168,7 +168,7 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: vault-0.24.1
+        helm.sh/chart: vault-0.25.0
         app.kubernetes.io/name: vault
         app.kubernetes.io/instance: hashicorp-vault
         component: server
@@ -205,7 +205,7 @@ spec:
       containers:
         - name: vault
           
-          image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
+          image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
           imagePullPolicy: IfNotPresent
           command:
           - "/bin/sh"
@@ -346,7 +346,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -373,7 +373,7 @@ spec:
   
   containers:
     - name: hashicorp-vault-server-test
-      image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
+      image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
       imagePullPolicy: IfNotPresent
       env:
         - name: VAULT_ADDR
diff --git a/common/tests/hashicorp-vault-industrial-edge-hub.expected.yaml b/common/tests/hashicorp-vault-industrial-edge-hub.expected.yaml
@@ -6,7 +6,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -18,7 +18,7 @@ metadata:
   name: hashicorp-vault-config
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -42,7 +42,7 @@ kind: ClusterRoleBinding
 metadata:
   name: hashicorp-vault-server-binding
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -63,7 +63,7 @@ metadata:
   name: hashicorp-vault-internal
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -95,7 +95,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -126,7 +126,7 @@ metadata:
   name: hashicorp-vault-ui
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault-ui
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -168,7 +168,7 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: vault-0.24.1
+        helm.sh/chart: vault-0.25.0
         app.kubernetes.io/name: vault
         app.kubernetes.io/instance: hashicorp-vault
         component: server
@@ -205,7 +205,7 @@ spec:
       containers:
         - name: vault
           
-          image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
+          image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
           imagePullPolicy: IfNotPresent
           command:
           - "/bin/sh"
@@ -346,7 +346,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -373,7 +373,7 @@ spec:
   
   containers:
     - name: hashicorp-vault-server-test
-      image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
+      image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
       imagePullPolicy: IfNotPresent
       env:
         - name: VAULT_ADDR
diff --git a/common/tests/hashicorp-vault-medical-diagnosis-hub.expected.yaml b/common/tests/hashicorp-vault-medical-diagnosis-hub.expected.yaml
@@ -6,7 +6,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -18,7 +18,7 @@ metadata:
   name: hashicorp-vault-config
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -42,7 +42,7 @@ kind: ClusterRoleBinding
 metadata:
   name: hashicorp-vault-server-binding
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -63,7 +63,7 @@ metadata:
   name: hashicorp-vault-internal
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -95,7 +95,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -126,7 +126,7 @@ metadata:
   name: hashicorp-vault-ui
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault-ui
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -168,7 +168,7 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: vault-0.24.1
+        helm.sh/chart: vault-0.25.0
         app.kubernetes.io/name: vault
         app.kubernetes.io/instance: hashicorp-vault
         component: server
@@ -205,7 +205,7 @@ spec:
       containers:
         - name: vault
           
-          image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
+          image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
           imagePullPolicy: IfNotPresent
           command:
           - "/bin/sh"
@@ -346,7 +346,7 @@ metadata:
   name: hashicorp-vault
   namespace: default
   labels:
-    helm.sh/chart: vault-0.24.1
+    helm.sh/chart: vault-0.25.0
     app.kubernetes.io/name: vault
     app.kubernetes.io/instance: hashicorp-vault
     app.kubernetes.io/managed-by: Helm
@@ -373,7 +373,7 @@ spec:
   
   containers:
     - name: hashicorp-vault-server-test
-      image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
+      image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
       imagePullPolicy: IfNotPresent
       env:
         - name: VAULT_ADDR
diff --git a/common/tests/hashicorp-vault-naked.expected.yaml b/common/tests/hashicorp-vault-naked.expected.yaml
diff --git a/common/tests/hashicorp-vault-normal.expected.yaml b/common/tests/hashicorp-vault-normal.expected.yaml
