[disconnected] Create hook to configure disconnected cluster#3814
[disconnected] Create hook to configure disconnected cluster#3814drosenfe wants to merge 1 commit intoopenstack-k8s-operators:mainfrom
Conversation
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/3bfbd3399c6a4ba885dea99111ee34ba ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 13m 20s |
6de4cf9 to
7310e9e
Compare
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/a9418611826d43ccbda9dbdbbe8f99a3 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 10m 37s |
slagle
left a comment
There was a problem hiding this comment.
you'll also need another task to login the dataplane nodes to the mirror registry. you can add this to edpm_container_registry_logins somewhere.
| packages: | ||
| - name: openstack-operator | ||
| - name: kubernetes-nmstate-operator | ||
| - name: openshift-cert-manager-operator |
There was a problem hiding this comment.
cert-manager-operator needs to be listed with a different catalog like so:
kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v2alpha1
mirror:
operators:
- catalog: {{ oc_mirror_catalog_url }}
packages:
- name: openstack-operator
- name: kubernetes-nmstate-operator
- name: openshift-cert-manager-operator
- name: metallb-operator
- name: local-storage-operator
- name: lvms-operator
- name: cluster-observability-operator
- catalog: {{ oc_mirror_cert_manager_catalog_url }}
packages:
- name: openshift-cert-manager-operator
additionalImages:
- name: registry.redhat.io/ubi8/ubi:latest
- name: registry.redhat.io/ubi9/ubi@sha256:20f695d2a91352d4eaa25107535126727b5945bff38ed36a3e59590f495046f0
I've used a separate var for the catalog source for openshift-cert-manager-operator, {{ oc_mirror_cert_manager_catalog_url }}, which should default to registry.redhat.io/redhat/redhat-operator-index:v4.18
This is because the cert-manager operator is not included in our index image we use in CI.
After using this ImageSetConfiguration you'll end up with CatalogSources generated for both sources:
[stack@host05 disconnected]$ ls -l mirror_location/working-dir/cluster-resources/
total 24
-rw-r--r--. 1 stack stack 417 Apr 9 21:11 cc-iib-1125611.yaml
-rw-r--r--. 1 stack stack 448 Apr 9 21:11 cc-redhat-operator-index-v4-18.yaml
-rw-r--r--. 1 stack stack 421 Apr 10 06:54 cs-iib-1125611.yaml
-rw-r--r--. 1 stack stack 436 Apr 10 13:34 cs-redhat-operator-index-v4-18.yaml
-rw-r--r--. 1 stack stack 1909 Apr 9 21:11 idms-oc-mirror.yaml
-rw-r--r--. 1 stack stack 1091 Apr 9 21:11 itms-oc-mirror.yaml
There was a problem hiding this comment.
In the example in oc_mirror_catalog_url section the openshift-cert-manager-operator line should be removed?
There was a problem hiding this comment.
yes, i think it should probably be removed. I didn't notice that when I teseted it though, and it seemed to be ok. let's try removing it though and see what happens.
|
|
||
| - name: Prepare catalog source for environment | ||
| ansible.builtin.shell: | | ||
| sed -i 's/cs-{{ index_image_name_tag | quote }}/redhat-operators/g' {{ mirror_location }}/working-dir/cluster-resources/cs-{{ index_image_name_tag }}.yaml |
There was a problem hiding this comment.
you only want this to apply to cs-redhat-operator-index-v4-18.yaml
cifmw will create it's own CatalogSource called openstack-operator-index that will be configured to use cifmw_ci_gen_kustomize_values_ooi_image, and then the mirror configuration will make sure the mirror gets used.
There was a problem hiding this comment.
I believe this will only apply to: cs-redhat-operator-index-v4-18.yaml. The previous set fact statement uses variable: oc_mirror_cert_manager_catalog_url to extract: redhat-operator-index-v4-18. I could hardcode the file name, but think this gives a little more flexibility.
7310e9e to
81450ab
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/68ec32cda5c9495bb05bbd86f98bb58d ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 17m 30s |
81450ab to
086c8b8
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/3baa9443fe84436d94eb8f62bc6e270b ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 21m 04s |
086c8b8 to
0a67b84
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/b7f6831c3a38441e8b31d359cb133524 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 26m 40s |
0a67b84 to
22d1864
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/749f1d93ae1948dc838dbe448b531af2 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 15m 20s |
22d1864 to
8220076
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/79903bc23f894b8b8233fa0880a098ee ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 16m 06s |
8220076 to
1a9a351
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/d3c2d308a96844728a4c40a91fe44dbe ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 19m 03s |
1a9a351 to
b4a5652
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/fa733e9d790e41f1b516d2829414f210 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 06m 55s |
b4a5652 to
72b53cb
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/6c682e2aa4c346d1a5abb87786fcb26a ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 20m 44s |
72b53cb to
163f026
Compare
|
recheck |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 13m 32s |
163f026 to
cb684fd
Compare
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 40m 33s |
cb684fd to
10b7ce2
Compare
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 09m 14s |
Create a hook to configure openshift cluster for disconnected deployment. The hook should execute after the cluster is deployed but before openstack is deployed. Signed-off-by: David Rosenfeld drosenfe@redhat.com
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 36m 33s |
Create a hook to configure openshift cluster for disconnected deployment. The hook should execute after the cluster is deployed but before openstack is deployed.
Signed-off-by: David Rosenfeld drosenfe@redhat.com