Skip to content

Commit a2a345a

Browse files
authored
Merge pull request #101 from mbaldessari/common-automatic-update
common automatic update
2 parents 013a68a + ea2f06e commit a2a345a

17 files changed

Lines changed: 110 additions & 104 deletions

common/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ load-iib: ## CI target to install Index Image Bundles
6767
for IIB in $(shell echo $(INDEX_IMAGES) | tr ',' '\n'); do \
6868
INDEX_IMAGE="$${IIB}" ansible-playbook common/ansible/playbooks/iib-ci/iib-ci.yaml; \
6969
done; \
70+
else \
71+
echo "No INDEX_IMAGES defined. Bailing out"; \
72+
exit 1; \
7073
fi
7174

7275

common/ansible/roles/iib_ci/tasks/fetch-operator-images.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
oc get packagemanifests -l "catalog=iib-{{ iib }}" --field-selector "metadata.name={{ item }}" \
2121
-o jsonpath="{.items[0].status.channels[?(@.name==\"{{ default_channel }}\")].currentCSVDesc.relatedImages}"
2222
register: related_images_raw
23+
retries: 5
24+
delay: 10
25+
until: related_images_raw is not failed
2326

2427
- name: Set related_images fact
2528
ansible.builtin.set_fact:
@@ -43,7 +46,7 @@
4346
- name: Read the operator bundle from the default channel
4447
ansible.builtin.shell: |
4548
set -o pipefail
46-
podman run -it --rm "{{ iib_image }}" alpha list channels /configs "{{ item }}" | grep --word-regexp "{{ default_channel }}" | awk '{ print $3 }'
49+
podman run -it --rm "{{ iib_image }}" alpha list channels /configs "{{ item }}" | grep -E "(\s){{ default_channel }}(\s)" | awk '{ print $3 }'
4750
register: bundle_channel_raw
4851

4952
- name: Set bundle fact

common/ansible/roles/iib_ci/tasks/setup-internal-registry.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
- name: Set registry allowedRegistries
4747
ansible.builtin.shell: >
48-
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\",
48+
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\",
4949
\"registry-proxy.engineering.redhat.com\", \"image-registry.openshift-image-registry.svc:5000\", \"{{ registry_route }}\"]}}}" --type=merge
5050
5151
- name: Set registry insecureRegistries

common/hashicorp-vault/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ name: hashicorp-vault
66
version: 0.0.1
77
dependencies:
88
- name: vault
9-
version: "0.24.1"
9+
version: "0.25.0"
1010
repository: "https://helm.releases.hashicorp.com"
-44.7 KB
Binary file not shown.
45.3 KB
Binary file not shown.

common/hashicorp-vault/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ vault:
4949
termination: "reencrypt"
5050
image:
5151
repository: "registry.connect.redhat.com/hashicorp/vault"
52-
tag: "1.13.1-ubi"
52+
tag: "1.14.0-ubi"

common/tests/hashicorp-vault-industrial-edge-factory.expected.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: hashicorp-vault
77
namespace: default
88
labels:
9-
helm.sh/chart: vault-0.24.1
9+
helm.sh/chart: vault-0.25.0
1010
app.kubernetes.io/name: vault
1111
app.kubernetes.io/instance: hashicorp-vault
1212
app.kubernetes.io/managed-by: Helm
@@ -18,7 +18,7 @@ metadata:
1818
name: hashicorp-vault-config
1919
namespace: default
2020
labels:
21-
helm.sh/chart: vault-0.24.1
21+
helm.sh/chart: vault-0.25.0
2222
app.kubernetes.io/name: vault
2323
app.kubernetes.io/instance: hashicorp-vault
2424
app.kubernetes.io/managed-by: Helm
@@ -42,7 +42,7 @@ kind: ClusterRoleBinding
4242
metadata:
4343
name: hashicorp-vault-server-binding
4444
labels:
45-
helm.sh/chart: vault-0.24.1
45+
helm.sh/chart: vault-0.25.0
4646
app.kubernetes.io/name: vault
4747
app.kubernetes.io/instance: hashicorp-vault
4848
app.kubernetes.io/managed-by: Helm
@@ -63,7 +63,7 @@ metadata:
6363
name: hashicorp-vault-internal
6464
namespace: default
6565
labels:
66-
helm.sh/chart: vault-0.24.1
66+
helm.sh/chart: vault-0.25.0
6767
app.kubernetes.io/name: vault
6868
app.kubernetes.io/instance: hashicorp-vault
6969
app.kubernetes.io/managed-by: Helm
@@ -95,7 +95,7 @@ metadata:
9595
name: hashicorp-vault
9696
namespace: default
9797
labels:
98-
helm.sh/chart: vault-0.24.1
98+
helm.sh/chart: vault-0.25.0
9999
app.kubernetes.io/name: vault
100100
app.kubernetes.io/instance: hashicorp-vault
101101
app.kubernetes.io/managed-by: Helm
@@ -126,7 +126,7 @@ metadata:
126126
name: hashicorp-vault-ui
127127
namespace: default
128128
labels:
129-
helm.sh/chart: vault-0.24.1
129+
helm.sh/chart: vault-0.25.0
130130
app.kubernetes.io/name: vault-ui
131131
app.kubernetes.io/instance: hashicorp-vault
132132
app.kubernetes.io/managed-by: Helm
@@ -168,7 +168,7 @@ spec:
168168
template:
169169
metadata:
170170
labels:
171-
helm.sh/chart: vault-0.24.1
171+
helm.sh/chart: vault-0.25.0
172172
app.kubernetes.io/name: vault
173173
app.kubernetes.io/instance: hashicorp-vault
174174
component: server
@@ -205,7 +205,7 @@ spec:
205205
containers:
206206
- name: vault
207207

208-
image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
208+
image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
209209
imagePullPolicy: IfNotPresent
210210
command:
211211
- "/bin/sh"
@@ -346,7 +346,7 @@ metadata:
346346
name: hashicorp-vault
347347
namespace: default
348348
labels:
349-
helm.sh/chart: vault-0.24.1
349+
helm.sh/chart: vault-0.25.0
350350
app.kubernetes.io/name: vault
351351
app.kubernetes.io/instance: hashicorp-vault
352352
app.kubernetes.io/managed-by: Helm
@@ -373,7 +373,7 @@ spec:
373373

374374
containers:
375375
- name: hashicorp-vault-server-test
376-
image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
376+
image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
377377
imagePullPolicy: IfNotPresent
378378
env:
379379
- name: VAULT_ADDR

common/tests/hashicorp-vault-industrial-edge-hub.expected.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: hashicorp-vault
77
namespace: default
88
labels:
9-
helm.sh/chart: vault-0.24.1
9+
helm.sh/chart: vault-0.25.0
1010
app.kubernetes.io/name: vault
1111
app.kubernetes.io/instance: hashicorp-vault
1212
app.kubernetes.io/managed-by: Helm
@@ -18,7 +18,7 @@ metadata:
1818
name: hashicorp-vault-config
1919
namespace: default
2020
labels:
21-
helm.sh/chart: vault-0.24.1
21+
helm.sh/chart: vault-0.25.0
2222
app.kubernetes.io/name: vault
2323
app.kubernetes.io/instance: hashicorp-vault
2424
app.kubernetes.io/managed-by: Helm
@@ -42,7 +42,7 @@ kind: ClusterRoleBinding
4242
metadata:
4343
name: hashicorp-vault-server-binding
4444
labels:
45-
helm.sh/chart: vault-0.24.1
45+
helm.sh/chart: vault-0.25.0
4646
app.kubernetes.io/name: vault
4747
app.kubernetes.io/instance: hashicorp-vault
4848
app.kubernetes.io/managed-by: Helm
@@ -63,7 +63,7 @@ metadata:
6363
name: hashicorp-vault-internal
6464
namespace: default
6565
labels:
66-
helm.sh/chart: vault-0.24.1
66+
helm.sh/chart: vault-0.25.0
6767
app.kubernetes.io/name: vault
6868
app.kubernetes.io/instance: hashicorp-vault
6969
app.kubernetes.io/managed-by: Helm
@@ -95,7 +95,7 @@ metadata:
9595
name: hashicorp-vault
9696
namespace: default
9797
labels:
98-
helm.sh/chart: vault-0.24.1
98+
helm.sh/chart: vault-0.25.0
9999
app.kubernetes.io/name: vault
100100
app.kubernetes.io/instance: hashicorp-vault
101101
app.kubernetes.io/managed-by: Helm
@@ -126,7 +126,7 @@ metadata:
126126
name: hashicorp-vault-ui
127127
namespace: default
128128
labels:
129-
helm.sh/chart: vault-0.24.1
129+
helm.sh/chart: vault-0.25.0
130130
app.kubernetes.io/name: vault-ui
131131
app.kubernetes.io/instance: hashicorp-vault
132132
app.kubernetes.io/managed-by: Helm
@@ -168,7 +168,7 @@ spec:
168168
template:
169169
metadata:
170170
labels:
171-
helm.sh/chart: vault-0.24.1
171+
helm.sh/chart: vault-0.25.0
172172
app.kubernetes.io/name: vault
173173
app.kubernetes.io/instance: hashicorp-vault
174174
component: server
@@ -205,7 +205,7 @@ spec:
205205
containers:
206206
- name: vault
207207

208-
image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
208+
image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
209209
imagePullPolicy: IfNotPresent
210210
command:
211211
- "/bin/sh"
@@ -346,7 +346,7 @@ metadata:
346346
name: hashicorp-vault
347347
namespace: default
348348
labels:
349-
helm.sh/chart: vault-0.24.1
349+
helm.sh/chart: vault-0.25.0
350350
app.kubernetes.io/name: vault
351351
app.kubernetes.io/instance: hashicorp-vault
352352
app.kubernetes.io/managed-by: Helm
@@ -373,7 +373,7 @@ spec:
373373

374374
containers:
375375
- name: hashicorp-vault-server-test
376-
image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
376+
image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
377377
imagePullPolicy: IfNotPresent
378378
env:
379379
- name: VAULT_ADDR

common/tests/hashicorp-vault-medical-diagnosis-hub.expected.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: hashicorp-vault
77
namespace: default
88
labels:
9-
helm.sh/chart: vault-0.24.1
9+
helm.sh/chart: vault-0.25.0
1010
app.kubernetes.io/name: vault
1111
app.kubernetes.io/instance: hashicorp-vault
1212
app.kubernetes.io/managed-by: Helm
@@ -18,7 +18,7 @@ metadata:
1818
name: hashicorp-vault-config
1919
namespace: default
2020
labels:
21-
helm.sh/chart: vault-0.24.1
21+
helm.sh/chart: vault-0.25.0
2222
app.kubernetes.io/name: vault
2323
app.kubernetes.io/instance: hashicorp-vault
2424
app.kubernetes.io/managed-by: Helm
@@ -42,7 +42,7 @@ kind: ClusterRoleBinding
4242
metadata:
4343
name: hashicorp-vault-server-binding
4444
labels:
45-
helm.sh/chart: vault-0.24.1
45+
helm.sh/chart: vault-0.25.0
4646
app.kubernetes.io/name: vault
4747
app.kubernetes.io/instance: hashicorp-vault
4848
app.kubernetes.io/managed-by: Helm
@@ -63,7 +63,7 @@ metadata:
6363
name: hashicorp-vault-internal
6464
namespace: default
6565
labels:
66-
helm.sh/chart: vault-0.24.1
66+
helm.sh/chart: vault-0.25.0
6767
app.kubernetes.io/name: vault
6868
app.kubernetes.io/instance: hashicorp-vault
6969
app.kubernetes.io/managed-by: Helm
@@ -95,7 +95,7 @@ metadata:
9595
name: hashicorp-vault
9696
namespace: default
9797
labels:
98-
helm.sh/chart: vault-0.24.1
98+
helm.sh/chart: vault-0.25.0
9999
app.kubernetes.io/name: vault
100100
app.kubernetes.io/instance: hashicorp-vault
101101
app.kubernetes.io/managed-by: Helm
@@ -126,7 +126,7 @@ metadata:
126126
name: hashicorp-vault-ui
127127
namespace: default
128128
labels:
129-
helm.sh/chart: vault-0.24.1
129+
helm.sh/chart: vault-0.25.0
130130
app.kubernetes.io/name: vault-ui
131131
app.kubernetes.io/instance: hashicorp-vault
132132
app.kubernetes.io/managed-by: Helm
@@ -168,7 +168,7 @@ spec:
168168
template:
169169
metadata:
170170
labels:
171-
helm.sh/chart: vault-0.24.1
171+
helm.sh/chart: vault-0.25.0
172172
app.kubernetes.io/name: vault
173173
app.kubernetes.io/instance: hashicorp-vault
174174
component: server
@@ -205,7 +205,7 @@ spec:
205205
containers:
206206
- name: vault
207207

208-
image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
208+
image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
209209
imagePullPolicy: IfNotPresent
210210
command:
211211
- "/bin/sh"
@@ -346,7 +346,7 @@ metadata:
346346
name: hashicorp-vault
347347
namespace: default
348348
labels:
349-
helm.sh/chart: vault-0.24.1
349+
helm.sh/chart: vault-0.25.0
350350
app.kubernetes.io/name: vault
351351
app.kubernetes.io/instance: hashicorp-vault
352352
app.kubernetes.io/managed-by: Helm
@@ -373,7 +373,7 @@ spec:
373373

374374
containers:
375375
- name: hashicorp-vault-server-test
376-
image: registry.connect.redhat.com/hashicorp/vault:1.13.1-ubi
376+
image: registry.connect.redhat.com/hashicorp/vault:1.14.0-ubi
377377
imagePullPolicy: IfNotPresent
378378
env:
379379
- name: VAULT_ADDR

0 commit comments

Comments
 (0)