From 26cc66d964c9e83024652a0c4609d91bb8fdd90c Mon Sep 17 00:00:00 2001 From: Ludovic Cleroux Date: Mon, 23 Oct 2023 14:44:35 +0200 Subject: [PATCH] ROX-20346 modify fleetshard template for gitops --- .secrets.baseline | 24 +++++++++---------- .../templates/fleetshard-sync.yaml | 4 ++++ .../helm/rhacs-terraform/terraform_cluster.sh | 2 ++ dp-terraform/helm/rhacs-terraform/values.yaml | 5 +++- templates/service-template.yml | 14 +++++++++++ 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 14903a1879..7cbacd7a00 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -462,70 +462,70 @@ "filename": "templates/service-template.yml", "hashed_secret": "13032f402fed753c2248419ea4f69f99931f6dbc", "is_verified": false, - "line_number": 564 + "line_number": 574 }, { "type": "Base64 High Entropy String", "filename": "templates/service-template.yml", "hashed_secret": "30025f80f6e22cdafb85db387d50f90ea884576a", "is_verified": false, - "line_number": 564 + "line_number": 574 }, { "type": "Base64 High Entropy String", "filename": "templates/service-template.yml", "hashed_secret": "355f24fd038bcaf85617abdcaa64af51ed19bbcf", "is_verified": false, - "line_number": 564 + "line_number": 574 }, { "type": "Base64 High Entropy String", "filename": "templates/service-template.yml", "hashed_secret": "3d8a1dcd2c3c765ce35c9a9552d23273cc4ddace", "is_verified": false, - "line_number": 564 + "line_number": 574 }, { "type": "Base64 High Entropy String", "filename": "templates/service-template.yml", "hashed_secret": "4ac7b0522761eba972467942cd5cd7499dd2c361", "is_verified": false, - "line_number": 564 + "line_number": 574 }, { "type": "Base64 High Entropy String", "filename": "templates/service-template.yml", "hashed_secret": "7639ab2a6bcf2ea30a055a99468c9cd844d4c22a", "is_verified": false, - "line_number": 564 + "line_number": 574 }, { "type": "Base64 High Entropy String", "filename": "templates/service-template.yml", "hashed_secret": "b56360daf4793d2a74991a972b34d95bc00fb2da", "is_verified": false, - "line_number": 564 + "line_number": 574 }, { "type": "Base64 High Entropy String", "filename": "templates/service-template.yml", "hashed_secret": "c9a73ef9ee8ce9f38437227801c70bcc6740d1a1", "is_verified": false, - "line_number": 564 + "line_number": 574 }, { "type": "Base64 High Entropy String", "filename": "templates/service-template.yml", "hashed_secret": "14736999d9940728c5294277831a702f7882dece", "is_verified": false, - "line_number": 601 + "line_number": 611 }, { "type": "Secret Keyword", "filename": "templates/service-template.yml", "hashed_secret": "4e199b4a1c40b497a95fcd1cd896351733849949", "is_verified": false, - "line_number": 688, + "line_number": 698, "is_secret": false }, { @@ -533,7 +533,7 @@ "filename": "templates/service-template.yml", "hashed_secret": "9d51dabe59aa776bef2909d3689374ebb93ab2be", "is_verified": false, - "line_number": 732 + "line_number": 742 } ], "test/support/certs.json": [ @@ -564,5 +564,5 @@ } ] }, - "generated_at": "2023-09-15T13:53:14Z" + "generated_at": "2023-10-23T12:42:41Z" } diff --git a/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml b/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml index 487e914d57..04d7abcd47 100644 --- a/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml +++ b/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml @@ -103,6 +103,10 @@ spec: name: fleetshard-sync key: "aws-secret-access-key" {{- end }} + - name: RHACS_GITOPS_ENABLED + value: {{ .Values.fleetshardSync.gitops.enabled | quote }} + - name: RHACS_TARGETED_OPERATOR_UPGRADES + value: {{ .Values.fleetshardSync.targetedOperatorUpgrades.enabled | quote }} volumeMounts: - mountPath: /var/run/secrets/tokens name: aws-token diff --git a/dp-terraform/helm/rhacs-terraform/terraform_cluster.sh b/dp-terraform/helm/rhacs-terraform/terraform_cluster.sh index df92af988e..bfc604add3 100755 --- a/dp-terraform/helm/rhacs-terraform/terraform_cluster.sh +++ b/dp-terraform/helm/rhacs-terraform/terraform_cluster.sh @@ -159,6 +159,8 @@ invoke_helm "${SCRIPT_DIR}" rhacs-terraform \ --set fleetshardSync.managedDB.performanceInsights=true \ --set fleetshardSync.aws.region="${CLUSTER_REGION}" \ --set fleetshardSync.aws.roleARN="${FLEETSHARD_SYNC_AWS_ROLE_ARN}" \ + --set fleetshardSync.gitops.enabled="${RHACS_GITOPS_ENABLED:-}" \ + --set fleetshardSync.targetedOperatorUpgrades.enabled="${RHACS_TARGETED_OPERATOR_UPGRADES:-}" \ --set fleetshardSync.telemetry.storage.endpoint="${FLEETSHARD_SYNC_TELEMETRY_STORAGE_ENDPOINT:-}" \ --set fleetshardSync.telemetry.storage.key="${FLEETSHARD_SYNC_TELEMETRY_STORAGE_KEY:-}" \ --set fleetshardSync.resources.requests.cpu="${FLEETSHARD_SYNC_CPU_REQUEST}" \ diff --git a/dp-terraform/helm/rhacs-terraform/values.yaml b/dp-terraform/helm/rhacs-terraform/values.yaml index 23c78ceb75..519e41f56c 100644 --- a/dp-terraform/helm/rhacs-terraform/values.yaml +++ b/dp-terraform/helm/rhacs-terraform/values.yaml @@ -61,7 +61,10 @@ fleetshardSync: username: "" password: "" email: "quayuser@example.com" - + gitops: + enabled: false + targetedOperatorUpgrades: + enabled: false acsOperator: enabled: false channel: latest diff --git a/templates/service-template.yml b/templates/service-template.yml index 4d783ba3aa..e9c9cfc72b 100644 --- a/templates/service-template.yml +++ b/templates/service-template.yml @@ -464,6 +464,16 @@ parameters: description: List of user agents from internal clients value: "fleet-manager-probe-service" +- name: RHACS_GITOPS_ENABLED + displayName: RHACS Gitops enabled + description: Whether to enable configuration of Centrals through gitops be enabled + value: "false" + +- name: RHACS_TARGETED_OPERATOR_UPGRADES + displayName: RHACS Targeted Operator Upgrades + description: Whether to enable targeted operator upgrades + value: "false" + objects: - kind: ConfigMap apiVersion: v1 @@ -1195,6 +1205,10 @@ objects: value: "${SCANNER_DB_CPU_LIMIT}" - name: SCANNER_DB_MEMORY_LIMIT value: "${SCANNER_DB_MEMORY_LIMIT}" + - name: RHACS_GITOPS_ENABLED + value: "${RHACS_GITOPS_ENABLED}" + - name: RHACS_TARGETED_OPERATOR_UPGRADES + value: "${RHACS_TARGETED_OPERATOR_UPGRADES}" command: - /usr/local/bin/fleet-manager - serve