diff --git a/install/roles/automation-hub/defaults/main.yml b/install/roles/automation-hub/defaults/main.yml index f74d8b6c..bc3a2642 100644 --- a/install/roles/automation-hub/defaults/main.yml +++ b/install/roles/automation-hub/defaults/main.yml @@ -15,17 +15,17 @@ htpasswd_file: /tmp/htpasswd # GitOps gitops_channel_version: 1.13 -gitops_version: 1.13.0 +gitops_version: 1.13.1 # ACM -acm_version: 2.10 +acm_version: 2.11 loki_version: 5.9 openshift_logging_version: 5.9 acm_namespace: tealc-rhacm acm_observability_namespace: open-cluster-management-observability # ACS -acs_version: 4.4 +acs_version: 4.5 acs_namespace: tealc-rhacs acs_stackrox_namespace: stackrox acs_api_token_file: "{{ playbook_dir }}/acs_api_token" diff --git a/install/roles/automation-hub/templates/acm/01-acm-subscription.yaml.j2 b/install/roles/automation-hub/templates/acm/01-acm-subscription.yaml.j2 index f11d8b27..907a05f1 100644 --- a/install/roles/automation-hub/templates/acm/01-acm-subscription.yaml.j2 +++ b/install/roles/automation-hub/templates/acm/01-acm-subscription.yaml.j2 @@ -5,7 +5,7 @@ metadata: name: advanced-cluster-management namespace: {{ acm_namespace }} spec: - channel: release-{{ acm_version }} + channel: release-{{ acm_version | string }} installPlanApproval: Automatic name: advanced-cluster-management source: redhat-operators diff --git a/install/roles/automation-hub/templates/argo/install/sub.yaml b/install/roles/automation-hub/templates/argo/install/sub.yaml index 746e3a14..efab07d5 100644 --- a/install/roles/automation-hub/templates/argo/install/sub.yaml +++ b/install/roles/automation-hub/templates/argo/install/sub.yaml @@ -6,9 +6,9 @@ metadata: labels: project: tealc spec: - channel: gitops-{{ gitops_channel_version }} + channel: gitops-{{ gitops_channel_version | string }} installPlanApproval: Manual name: openshift-gitops-operator source: redhat-operators sourceNamespace: openshift-marketplace - startingCSV: openshift-gitops-operator.v{{ gitops_version }} + startingCSV: openshift-gitops-operator.v{{ gitops_version | string }} diff --git a/install/roles/automation-hub/templates/logging/install/loki/03-loki-stack.yaml.j2 b/install/roles/automation-hub/templates/logging/install/loki/03-loki-stack.yaml.j2 index 2338e916..fd96d7d2 100644 --- a/install/roles/automation-hub/templates/logging/install/loki/03-loki-stack.yaml.j2 +++ b/install/roles/automation-hub/templates/logging/install/loki/03-loki-stack.yaml.j2 @@ -12,6 +12,8 @@ spec: schemas: - effectiveDate: '2022-06-01' version: v12 + - effectiveDate: "2024-04-02" + version: v13 secret: name: {{ logging_loki_s3_secret }} type: s3