From e083b9119114e2d2ef9199f8e3fd41b956e0019f Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Lopez Date: Fri, 23 Aug 2024 12:26:28 +0200 Subject: [PATCH] [Casc]: Moving to shared lib and preparing different configuration of shared lib for ha vs none-ha --- blueprints/02-at-scale/cbci/casc/mc/ha/bundle.yaml | 2 ++ blueprints/02-at-scale/cbci/casc/mc/ha/jcasc/main.yaml | 10 ++++++++++ .../cbci/casc/mc/ha/variables/variables.yaml | 4 ++++ .../02-at-scale/cbci/casc/mc/none-ha/bundle.yaml | 2 ++ .../02-at-scale/cbci/casc/mc/none-ha/jcasc/main.yaml | 10 ++++++++++ .../cbci/casc/mc/none-ha/variables/variables.yaml | 4 ++++ .../02-at-scale/cbci/casc/mc/parent/jcasc/main.yaml | 10 ---------- .../cbci/casc/mc/parent/variables/variables.yaml | 4 +--- blueprints/02-at-scale/cbci/casc/oc/items/root.yaml | 4 ++-- .../02-at-scale/cbci/casc/oc/variables/variables.yaml | 2 +- blueprints/02-at-scale/k8s/cbci-values.yml | 2 +- 11 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 blueprints/02-at-scale/cbci/casc/mc/ha/variables/variables.yaml create mode 100644 blueprints/02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml diff --git a/blueprints/02-at-scale/cbci/casc/mc/ha/bundle.yaml b/blueprints/02-at-scale/cbci/casc/mc/ha/bundle.yaml index dbb47c13..59927d65 100644 --- a/blueprints/02-at-scale/cbci/casc/mc/ha/bundle.yaml +++ b/blueprints/02-at-scale/cbci/casc/mc/ha/bundle.yaml @@ -7,3 +7,5 @@ allowCapExceptions: true jcascMergeStrategy: "errorOnConflict" jcasc: - jcasc +variables: + - variables diff --git a/blueprints/02-at-scale/cbci/casc/mc/ha/jcasc/main.yaml b/blueprints/02-at-scale/cbci/casc/mc/ha/jcasc/main.yaml index b5dbc48f..16875536 100644 --- a/blueprints/02-at-scale/cbci/casc/mc/ha/jcasc/main.yaml +++ b/blueprints/02-at-scale/cbci/casc/mc/ha/jcasc/main.yaml @@ -1,3 +1,13 @@ unclassified: globalDefaultFlowDurabilityLevel: durabilityHint: MAX_SURVIVABILITY + globalLibraries: + libraries: + - defaultVersion: ${sharedLibBranch} + name: "common" + retriever: + modernSCM: + libraryPath: ${sharedLibPath} + scm: + git: + remote: ${sharedLibRepo} \ No newline at end of file diff --git a/blueprints/02-at-scale/cbci/casc/mc/ha/variables/variables.yaml b/blueprints/02-at-scale/cbci/casc/mc/ha/variables/variables.yaml new file mode 100644 index 00000000..8f322f47 --- /dev/null +++ b/blueprints/02-at-scale/cbci/casc/mc/ha/variables/variables.yaml @@ -0,0 +1,4 @@ +variables: + - sharedLibRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" + - sharedLibBranch: shared-lib + - sharedLibPath: "blueprints/02-at-scale/cbci/shared-lib" diff --git a/blueprints/02-at-scale/cbci/casc/mc/none-ha/bundle.yaml b/blueprints/02-at-scale/cbci/casc/mc/none-ha/bundle.yaml index 750e7631..69ededd1 100644 --- a/blueprints/02-at-scale/cbci/casc/mc/none-ha/bundle.yaml +++ b/blueprints/02-at-scale/cbci/casc/mc/none-ha/bundle.yaml @@ -7,3 +7,5 @@ allowCapExceptions: true jcascMergeStrategy: "errorOnConflict" jcasc: - jcasc +variables: + - variables diff --git a/blueprints/02-at-scale/cbci/casc/mc/none-ha/jcasc/main.yaml b/blueprints/02-at-scale/cbci/casc/mc/none-ha/jcasc/main.yaml index 265cf97b..885d72cc 100644 --- a/blueprints/02-at-scale/cbci/casc/mc/none-ha/jcasc/main.yaml +++ b/blueprints/02-at-scale/cbci/casc/mc/none-ha/jcasc/main.yaml @@ -1,3 +1,13 @@ unclassified: globalDefaultFlowDurabilityLevel: durabilityHint: PERFORMANCE_OPTIMIZED + globalLibraries: + libraries: + - defaultVersion: ${sharedLibBranch} + name: "common" + retriever: + modernSCM: + libraryPath: ${sharedLibPath} + scm: + git: + remote: ${sharedLibRepo} diff --git a/blueprints/02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml b/blueprints/02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml new file mode 100644 index 00000000..8f322f47 --- /dev/null +++ b/blueprints/02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml @@ -0,0 +1,4 @@ +variables: + - sharedLibRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" + - sharedLibBranch: shared-lib + - sharedLibPath: "blueprints/02-at-scale/cbci/shared-lib" diff --git a/blueprints/02-at-scale/cbci/casc/mc/parent/jcasc/main.yaml b/blueprints/02-at-scale/cbci/casc/mc/parent/jcasc/main.yaml index 301da1c9..11966cd9 100644 --- a/blueprints/02-at-scale/cbci/casc/mc/parent/jcasc/main.yaml +++ b/blueprints/02-at-scale/cbci/casc/mc/parent/jcasc/main.yaml @@ -38,16 +38,6 @@ unclassified: endpoint: ${ot_endpoint} cascItemsConfiguration: variableInterpolationEnabledForAdmin: true - globalLibraries: - libraries: - - defaultVersion: ${sharedLibBranch} - name: "common" - retriever: - modernSCM: - libraryPath: ${sharedLibPath} - scm: - git: - remote: ${sharedLibRepo} aws: awsCredentials: region: "${sec_awsRegion}" diff --git a/blueprints/02-at-scale/cbci/casc/mc/parent/variables/variables.yaml b/blueprints/02-at-scale/cbci/casc/mc/parent/variables/variables.yaml index 429fcc4d..76d47a05 100644 --- a/blueprints/02-at-scale/cbci/casc/mc/parent/variables/variables.yaml +++ b/blueprints/02-at-scale/cbci/casc/mc/parent/variables/variables.yaml @@ -2,6 +2,4 @@ variables: - ot_endpoint: "http://tempo.kube-prometheus-stack.svc.cluster.local:4317" - s3bucketPreffix: "cbci" - regSecretsName: "cbci-sec-reg" - - sharedLibRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" - - sharedLibBranch: develop - - sharedLibPath: "blueprints/02-at-scale/cbci/shared-lib" + diff --git a/blueprints/02-at-scale/cbci/casc/oc/items/root.yaml b/blueprints/02-at-scale/cbci/casc/oc/items/root.yaml index 18c4dce4..b1c13a3b 100644 --- a/blueprints/02-at-scale/cbci/casc/oc/items/root.yaml +++ b/blueprints/02-at-scale/cbci/casc/oc/items/root.yaml @@ -53,7 +53,7 @@ items: "cloudbees.prometheus": "true" properties: - configurationAsCode: - bundle: "develop/none-ha" + bundle: "shared-lib/none-ha" # Casc, HA - kind: managedController name: team-c-ha @@ -100,4 +100,4 @@ items: "cloudbees.prometheus": "true" properties: - configurationAsCode: - bundle: "develop/ha" + bundle: "shared-lib/ha" diff --git a/blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml b/blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml index 82f69637..358c559c 100644 --- a/blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml +++ b/blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml @@ -1,7 +1,7 @@ variables: - message: "Welcome to the CloudBees CI blueprint add-on: At scale!" - cascRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" - - cascBranch: develop + - cascBranch: shared-lib - cascPathController: "/blueprints/02-at-scale/cbci/casc/mc/" - ldapManagerDN: "cn=admin,dc=acme,dc=org" - ldapRootDN: "dc=acme,dc=org" diff --git a/blueprints/02-at-scale/k8s/cbci-values.yml b/blueprints/02-at-scale/k8s/cbci-values.yml index e0062df8..36265238 100644 --- a/blueprints/02-at-scale/k8s/cbci-values.yml +++ b/blueprints/02-at-scale/k8s/cbci-values.yml @@ -16,7 +16,7 @@ OperationsCenter: Retriever: Enabled: true scmRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" - scmBranch: develop + scmBranch: shared-lib scmBundlePath: blueprints/02-at-scale/cbci/casc/oc scmPollingInterval: PT20M Persistence: