Merge branch 'main' into add-rally-role

Author: lkuchlan

ci/playbooks/multinode-customizations.yml

@@ -213,7 +213,10 @@
 
     - name: Set insecure registry on crc node
       ansible.builtin.include_tasks: tasks/set_crc_insecure_registry.yml
-      when: content_provider_registry_ip is defined or cifmw_crc_registry_mirror_content is defined
+      when: >-
+        content_provider_registry_ip is defined or
+        cifmw_crc_registry_mirror_content is defined or
+        cifmw_crc_additional_insecure_registries is defined
 
 - hosts: controller
   name: "Tweak Controller"

ci/playbooks/tasks/set_crc_insecure_registry.yml

@@ -38,6 +38,14 @@
     image.config.openshift.io/cluster
   loop: "{{ cifmw_crc_additional_allowed_registries }}"
 
+- name: Add additional insecure registries
+  when: cifmw_crc_additional_insecure_registries is defined
+  ansible.builtin.shell: |
+    oc patch --type=json \
+    --patch='[{"op": "add", "path": "/spec/registrySources/insecureRegistries/-", "value": "{{ item }}"}]' \
+    image.config.openshift.io/cluster
+  loop: "{{ cifmw_crc_additional_insecure_registries }}"
+
 - name: Ensure registries.conf.d exists
   become: true
   when: cifmw_crc_registry_mirror_content is defined or content_provider_registry_ip is defined
@@ -61,6 +69,24 @@
       mirror-by-digest-only = false
       prefix = ""
 
+- name: Set insecure registry in crio for additional registries
+  become: true
+  when: cifmw_crc_additional_insecure_registries is defined
+  ansible.builtin.blockinfile:
+    state: present
+    insertafter: EOF
+    marker: "# ANSIBLE MANAGED BLOCK - additional insecure registry: {{ item }}"
+    dest: /etc/containers/registries.conf.d/99-insecure-registry.conf
+    create: true
+    content: |-
+      [[registry]]
+      location = "{{ item }}"
+      insecure = true
+      blocked = false
+      mirror-by-digest-only = false
+      prefix = ""
+  loop: "{{ cifmw_crc_additional_insecure_registries }}"
+
 - name: Set registry mirror override
   when: cifmw_crc_registry_mirror_content is defined
   become: true
@@ -72,7 +98,10 @@
     content: "{{ cifmw_crc_registry_mirror_content }}"
 
 - name: Restart crio
-  when: cifmw_crc_registry_mirror_content is defined or content_provider_registry_ip is defined
+  when: >-
+    cifmw_crc_registry_mirror_content is defined or
+    content_provider_registry_ip is defined or
+    cifmw_crc_additional_insecure_registries is defined
   become: true
   ansible.builtin.service:
     name: crio

docs/dictionary/en-custom.txt

@@ -33,6 +33,7 @@ UTF
 ZipFile
 aaabbcc
 abcdefghij
+accesstoken
 addr
 aes
 afuscoar
@@ -53,6 +54,7 @@ args
 arx
 arxcruz
 auth
+authcode
 authfile
 autoconfiguration
 autoheld
@@ -121,6 +123,7 @@ cjeanner
 ckcg
 cli
 client
+clientcredentials
 clusterimageset
 clusterpool
 cmd
@@ -177,6 +180,7 @@ dev
 devscript
 devscripts
 devsetup
+deviceauthz
 dfb
 dfce
 dfg
@@ -315,11 +319,15 @@ junos
 jxe
 jzxbol
 kcgpby
+kctestuser1
+kctestuser2
 keepalived
 kerberos
 keycloak
 keypair
 keyring
+keystoneauth
+keystoneauth1
 keytab
 kinit
 kni
@@ -393,6 +401,7 @@ mtu
 multiline
 multinode
 multipath
+multirealm
 multus
 myorg
 mysqld
@@ -445,6 +454,10 @@ ocpbm
 ocppr
 odkvmf
 oidc
+oidcaccesstoken
+oidcauthcode
+oidcclientcredentials
+oidcpassword
 okd
 ol
 olm
@@ -652,6 +665,11 @@ usermod
 usr
 utils
 uuid
+v3oidcaccesstoken
+v3oidcauthcode
+v3oidcclientcredentials
+v3oidcdeviceauthz
+v3oidcpassword
 vbibob
 vbmc
 vcgvuc