Skip to content

Commit c76567d

Browse files
akrzosakrzos
authored
Merge pull request #652 from akrzos/update_bastion_registry_operator_defaults
Update default versions across jetlag for bastion registry and acm de…
2 parents 0b1bee9 + 1760dd2 commit c76567d

File tree

10 files changed

+27
-27
lines changed

10 files changed

+27
-27
lines changed

‎ansible/roles/hv-vm-manifests-sno/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ siteconfig_baremetalhost_override_converged_flow: false
2525
siteconfig_exclude_sync_time_once: false
2626

2727
# Enable DU profile SNO installConfigOverrides (Can not be combined with siteconfig_fips)
28-
# Can be set to "none", "4.12", "4.13", "4.14", "4.15", "4.16", or "4.17"
29-
siteconfig_sno_du_profile: "4.16"
28+
# Can be set to "none", "4.12", "4.13", "4.14", "4.15", "4.16", "4.17", "4.18", "4.19"
29+
siteconfig_sno_du_profile: "4.18"
3030

3131
# Enable fips via installConfigOverrides (Set siteconfig_sno_du_profile to "none")
3232
siteconfig_fips: false

‎ansible/roles/hv-vm-manifests-sno/templates/ai-manifest.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ metadata:
9292
annotations:
9393
{% if siteconfig_sno_du_profile == "4.15" %}
9494
agent-install.openshift.io/install-config-overrides: '{"networking":{"networkType":"OVNKubernetes"},"capabilities":{"baselineCapabilitySet":"None","additionalEnabledCapabilities":["OperatorLifecycleManager","NodeTuning"]}}'
95-
{% elif siteconfig_sno_du_profile in ["4.16", "4.17"] %}
95+
{% elif siteconfig_sno_du_profile in ["4.16", "4.17", "4.18", "4.19"] %}
9696
agent-install.openshift.io/install-config-overrides: '{"networking":{"networkType":"OVNKubernetes"},"capabilities":{"baselineCapabilitySet":"None","additionalEnabledCapabilities":["OperatorLifecycleManager","Ingress","NodeTuning"]}}'
9797
{% else %}
9898
agent-install.openshift.io/install-config-overrides: '{"networking":{"networkType":"OVNKubernetes"}}'
@@ -184,7 +184,7 @@ metadata:
184184
name: {{ inventory_hostname }}
185185
labels:
186186
common: 'true'
187-
{% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16", "4.17"] %}
187+
{% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16", "4.17", "4.18", "4.19"] %}
188188
du-profile: "{{ siteconfig_sno_du_profile }}"
189189
{% endif %}
190190
group-du-sno: ''

‎ansible/roles/hv-vm-manifests-sno/templates/ai-siteconfig.yml.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\", \"NodeTuning\" ] }}"
3434
# 4.15
3535
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"NodeTuning\" ] }}"
36-
# 4.16, 4.17
36+
# 4.16, 4.17, 4.18, 4.19
3737
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"Ingress\", \"NodeTuning\" ] }}"
3838
{% elif siteconfig_sno_du_profile in ["4.13", "4.14"] %}
3939
# 4.12
@@ -42,7 +42,7 @@ spec:
4242
installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\", \"NodeTuning\" ] }}"
4343
# 4.15
4444
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"NodeTuning\" ] }}"
45-
# 4.16, 4.17
45+
# 4.16, 4.17, 4.18, 4.19
4646
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"Ingress\", \"NodeTuning\" ] }}"
4747
{% elif siteconfig_sno_du_profile == "4.15" %}
4848
# 4.12
@@ -51,16 +51,16 @@ spec:
5151
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\", \"NodeTuning\" ] }}"
5252
# 4.15
5353
installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"NodeTuning\" ] }}"
54-
# 4.16, 4.17
54+
# 4.16, 4.17, 4.18, 4.19
5555
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"Ingress\", \"NodeTuning\" ] }}"
56-
{% elif siteconfig_sno_du_profile in ["4.16", "4.17"] %}
56+
{% elif siteconfig_sno_du_profile in ["4.16", "4.17", "4.18", "4.19"] %}
5757
# 4.12
5858
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\" ] }}"
5959
# 4.13, 4.14
6060
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\", \"NodeTuning\" ] }}"
6161
# 4.15
6262
# installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"NodeTuning\" ] }}"
63-
# 4.16, 4.17
63+
# 4.16, 4.17, 4.18, 4.19
6464
installConfigOverrides: "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"Ingress\", \"NodeTuning\" ] }}"
6565
{% else %}
6666
{% if siteconfig_fips %}
@@ -69,7 +69,7 @@ spec:
6969
{% endif %}
7070
clusterLabels:
7171
common: 'true'
72-
{% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16", "4.17"] %}
72+
{% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16", "4.17", "4.18", "4.19"] %}
7373
du-profile: "{{ siteconfig_sno_du_profile }}"
7474
{% endif %}
7575
group-du-sno: ''

‎ansible/roles/sno-post-cluster-install/defaults/main/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ isolated_cpus: 2-47,50-95
2222

2323
du_profile: false
2424
operator_index_name: redhat-operator-index
25-
operator_index_tag: v4.16
25+
operator_index_tag: v4.18
2626

2727
# Minio deployment is an object storage pod for use with ACM
2828
setup_minio: false

‎ansible/roles/sync-operator-index/defaults/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ registry_path: /opt/registry
1515
operator_index_name: redhat-operator-index
1616

1717
# operator_index_tag represents the destination operator tag on the installed cluster (actual image tags can be found in the operator_index_container_image value under operators_to_sync)
18-
operator_index_tag: v4.16
18+
operator_index_tag: v4.18
1919

2020
# Tag to be used with the ose-operator-registry container image
21-
ose_operator_registry_tag: v4.16
21+
ose_operator_registry_tag: v4.18
2222

23-
# These defaults match ACM ZTP Scale testing (4.16 SNO with 4.16 Operators). For SNO DU profile defaults, refer ansible/vars/sync-operator-index.sample.yml
23+
# These defaults match ACM ZTP Scale testing (4.18 SNO with 4.18 Operators). For SNO DU profile defaults, refer ansible/vars/sync-operator-index.sample.yml
2424
operators_to_sync:
2525
- name: redhat-operators
2626
brew_index: false
27-
operator_index_container_image: registry.redhat.io/redhat/redhat-operator-index:v4.16
27+
operator_index_container_image: registry.redhat.io/redhat/redhat-operator-index:v4.18
2828
operators:
2929
- ansible-automation-platform-operator
3030
- cluster-logging
@@ -39,6 +39,6 @@ operators_to_sync:
3939
- volsync-product
4040
#- name: certified-operators
4141
# brew_index: false
42-
# operator_index_container_image: registry.redhat.io/redhat/certified-operator-index:v4.16
42+
# operator_index_container_image: registry.redhat.io/redhat/certified-operator-index:v4.18
4343
# operators:
4444
# - sriov-fec

‎ansible/roles/sync-operator-index/templates/operator-index.Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LABEL operators.operatorframework.io.index.configs.v1=/configs
1616
{% else %}
1717
# The base image is expected to contain
1818
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
19-
{% if ose_operator_registry_tag in ["v4.15", "v4.16"] %}
19+
{% if ose_operator_registry_tag in ["v4.15", "v4.16", "v4.17", "v4.18", "v4.19"] %}
2020
FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:{{ ose_operator_registry_tag }}
2121
{% else %}
2222
FROM registry.redhat.io/openshift4/ose-operator-registry:{{ ose_operator_registry_tag }}

‎ansible/vars/hv.sample.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ standard_cluster_count: 0
3939
standard_cluster_node_count: 5
4040

4141
# The cluster imageset used in the manifests
42-
cluster_image_set: openshift-4.16.3
42+
cluster_image_set: openshift-4.18.16
4343

4444
# Include ACM CRs in the manifests
4545
hv_vm_manifest_acm_cr: true

‎ansible/vars/sync-acm-d.sample.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ rhacm_build: 2.11.0-DOWNSTREAM-2024-06-26-14-32-34
66

77
# ZTP - Zero-Touch Provisioning Site Generator Image
88
ztp_site_generator_image: registry-proxy.engineering.redhat.com/rh-osbs/openshift4-ztp-site-generate
9-
ztp_site_generator_image_tag: v4.16.0-34
9+
ztp_site_generator_image_tag: v4.18.1-1
1010

1111
# ACM - Advanced Cluster Management Policy Generator Image
1212
rhacm_policy_generator_image: registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9
1313
rhacm_policy_generator_image_tag: v2.10
1414

1515
# TALM - Topology Aware Lifecycle Manager Images (Orchestrates DU Profile Policies and Upgrade Policies)
1616
cluster_group_upgrades_operator_image: quay.io/openshift-kni/cluster-group-upgrades-operator
17-
cluster_group_upgrades_operator_image_tag: 4.16.0
17+
cluster_group_upgrades_operator_image_tag: 4.18.0
1818
cluster_group_upgrades_operator_precache_image: quay.io/openshift-kni/cluster-group-upgrades-operator-precache
19-
cluster_group_upgrades_operator_precache_image_tag: 4.16.0
19+
cluster_group_upgrades_operator_precache_image_tag: 4.18.0
2020
cluster_group_upgrades_operator_recovery_image: quay.io/openshift-kni/cluster-group-upgrades-operator-recovery
21-
cluster_group_upgrades_operator_recovery_image_tag: 4.16.0
21+
cluster_group_upgrades_operator_recovery_image_tag: 4.18.0
2222
origin_kube_rbac_proxy_image: quay.io/openshift/origin-kube-rbac-proxy
2323
origin_kube_rbac_proxy_image_tag: 4.15
2424

‎ansible/vars/sync-operator-index.sample.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ bastion_cluster_config_dir: /root/{{ cluster_type }}
1111
operator_index_name: redhat-operator-index
1212

1313
# operator_index_tag represents the destination operator tag on the installed cluster (actual image tags can be found in the operator_index_container_image value under operators_to_sync)
14-
operator_index_tag: v4.16
14+
operator_index_tag: v4.18
1515

1616
# Tag to be used with the ose-operator-registry container image
17-
ose_operator_registry_tag: v4.16
17+
ose_operator_registry_tag: v4.18
1818

1919
# All of the following operators apply as part of DU profile, sync-operator-index makes all the required DU operators available through a single catalog source
2020
operators_to_sync:
2121
- name: redhat-operators
2222
brew_index: false
23-
operator_index_container_image: registry.redhat.io/redhat/redhat-operator-index:v4.16
23+
operator_index_container_image: registry.redhat.io/redhat/redhat-operator-index:v4.18
2424
operators:
2525
# - ansible-automation-platform-operator
2626
- cluster-logging
@@ -35,7 +35,7 @@ operators_to_sync:
3535
# - volsync-product
3636
- name: certified-operators
3737
brew_index: false
38-
operator_index_container_image: registry.redhat.io/redhat/certified-operator-index:v4.16
38+
operator_index_container_image: registry.redhat.io/redhat/certified-operator-index:v4.18
3939
operators:
4040
- sriov-fec
4141

‎docs/deploy-vmno.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ ssh_public_key_file: ~/.ssh/id_rsa.pub
246246
install_tc: true
247247
248248
# Setup and use coredns instead of dnsmasq
249-
setup_coredns: true
249+
setup_coredns: false
250250
251251
# Enables using DHCP instead of relying on static network configuration for VMs
252252
setup_hv_vm_dhcp: false

0 commit comments

Comments
 (0)