Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4c05974
Add some comments to make if/else and loops clearer
mbaldessari Jul 24, 2023
36d679a
Merge pull request #332 from mbaldessari/comments
mbaldessari Jul 24, 2023
dd3cdcb
Add some more comments in applications.yaml
mbaldessari Jul 27, 2023
5f33f33
Add a default for options applicationRetryLimit
mbaldessari Jul 27, 2023
91f3ef0
Split out values files to a helper for the acm chart
mbaldessari Jul 27, 2023
17697e5
Fix up tests
mbaldessari Jul 27, 2023
3bd8487
Merge pull request #333 from mbaldessari/cleanup
mbaldessari Jul 27, 2023
669ff92
Fix sa/namespace mixup in vault_spokes_init
stocky37 Jul 28, 2023
d7994cb
Merge pull request #334 from stocky37/fix-vault-unseal-ansible
mbaldessari Jul 30, 2023
5cb41a3
Update local patch
mbaldessari Jul 31, 2023
9d2df97
Update ESO to 0.8.5
mbaldessari Jul 31, 2023
e720991
Tweak ESO UBI images
mbaldessari Jul 31, 2023
15363f6
Merge pull request #335 from mbaldessari/fix-eso
mbaldessari Jul 31, 2023
4cbef5e
Upgrade vault-helm to v0.25.0
mbaldessari Jul 31, 2023
49728fa
Error out from load-iib when INDEX_IMAGES is undefined
mbaldessari Aug 1, 2023
bc74b85
Merge pull request #337 from mbaldessari/iib-ux
mbaldessari Aug 1, 2023
35e64a1
Merge pull request #336 from mbaldessari/vault-helm-0.25.0
mbaldessari Aug 1, 2023
81ea894
Add docker.io to the whitelisted registries when loading an IIB
mbaldessari Aug 1, 2023
ffac9c2
Merge pull request #338 from mbaldessari/explicit-image-iib
mbaldessari Aug 1, 2023
2ec5ef5
Fix fetching the bundle name when loading an IIB
mbaldessari Aug 9, 2023
2bc2534
Merge pull request #339 from mbaldessari/iib-fix
mbaldessari Aug 9, 2023
5d908db
Add retries when getting related images
mbaldessari Aug 10, 2023
da6ab17
Merge pull request #340 from mbaldessari/iib-fix2
mbaldessari Aug 10, 2023
ecf8571
Merge remote-tracking branch 'common-upstream/main' into common-autom…
mbaldessari Aug 14, 2023
ea2f06e
Fix up common/ tests
mbaldessari Aug 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
5 changes: 4 additions & 1 deletion common/ansible/roles/iib_ci/tasks/fetch-operator-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/hashicorp-vault/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Binary file removed common/hashicorp-vault/charts/vault-0.24.1.tgz
Binary file not shown.
Binary file added common/hashicorp-vault/charts/vault-0.25.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion common/hashicorp-vault/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
20 changes: 10 additions & 10 deletions common/tests/hashicorp-vault-industrial-edge-factory.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions common/tests/hashicorp-vault-industrial-edge-hub.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions common/tests/hashicorp-vault-medical-diagnosis-hub.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading