Including load boy HA vs not HA

carlosrodlop · Sep 29, 2023 · e6e1b13 · e6e1b13
1 parent 4f91317
commit e6e1b13
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/helm/charts/cb-ci-local/templates/oc-casc-bundle.yaml b/helm/charts/cb-ci-local/templates/oc-casc-bundle.yaml
@@ -52,13 +52,13 @@ data:
  items:
 {{- range (untilStep 0 (int .Values.controllers.loadTest.controllers) 1) }}
  - kind: managedController
- name: load-boy{{ . }}
+ name: load-boy-ha-{{ . }}
  properties:
  - configurationAsCode:
  bundle: "main/modern.load-boy"
  configuration:
  kubernetes:
- domain: load-boy{{ . }}
+ domain: load-boy-ha-{{ . }}
  replication:
  config:
  maxReplicas: 4
@@ -93,7 +93,19 @@ data:
  secretName: cbci-secrets
 {{- end }}
 {{- else }}
- items: []
+ items:
+ - kind: managedController
+ name: load-boy-no-ha
+ configuration:
+ kubernetes:
+ memory: 6144
+ cpus: 4.0
+ disk: 5
+ # storageClassName: my-storage-class
+ domain: load-boy-no-ha
+ properties:
+ - configurationAsCode:
+ bundle: "main/modern.load-boy"
 {{- end }}
  rbac.yaml: |-
 {{ .Files.Get "casc/oc/modern.oc.advance/rbac.yaml" | indent 4 }}

diff --git a/make/cb-ci/.env.example b/make/cb-ci/.env.example
@@ -33,8 +33,8 @@ REGISTRY_USER_NAME="exampleUser"
 REGISTRY_USER_PASS="exampleSecret"
 #Registry User Mail
 REGISTRY_USER_MAIL="example@mail.com"
-#Number of Load Controller
-N_LOAD_CONTROLLER="1"
+#Number of Load Controller. It runs on HA Mode
+N_LOAD_CONTROLLER_HA="1"
 #CloudBees Temp License details
 LIC_FIRSTNAME="Admin Name"
 LIC_LASTNAME="Admin Lastname"
@@ -43,15 +43,15 @@ LIC_COMPANY="ACME"
 ######################
 # MAKEFILE CONFIG
 ######################
-#Bundle validations
-BUNDLE_VAL="modern.oc.advance"
-PATH_BUNDLE_VAL="cb-ci-local/casc/oc"
-#Application Version Used for utility https://github.com/kyounger/casc-plugin-dependency-calculation
-RUN_CMD=/home/casc-user/run.sh # See
+#Plugins calculations https://github.com/kyounger/casc-plugin-dependency-calculation
+RUN_CMD=/home/casc-user/run.sh # See https://github.com/carlosrodlop/docker-lib/tree/main/docker/bash5.alpine
 CBCI_CASC_BUNDLE_PATH=/home/casc-user/labs/terraform-lib/libs/k8s/helm/charts/cb-ci-local/casc
 CBCI_CASC_BUNDLE_TYPE=oc
 CBCI_CASC_BUNDLE_NAME=oc/modern.oc.simple
 CBCI_CASC_BUNDLE_PLUGINS="plugins.yaml"
+#Bundle validations
+BUNDLE_VAL="modern.oc.advance"
+PATH_BUNDLE_VAL="cb-ci-local/casc/oc"
 #Jenkins CLI auth details https://github.com/carlosrodlop/docker-lib/tree/main/docker/ooldap.debian
 ADMIN_JENKINS_USER="admin_cbci_a"
 ADMIN_JENKINS_PASS="admin_pass"
diff --git a/make/cb-ci/Makefile b/make/cb-ci/Makefile
@@ -89,7 +89,7 @@ update-advance: check_kubeconfig check_envfile guard-CB_LB_CONFIG
  s/\$${agentRegistryUserName}/$$REGISTRY_USER_NAME/g; \
  s/\$${agentRegistryUserPass}/$$REGISTRY_USER_PASS/g; \
  s/\$${agentRegistryUserMail}/$$REGISTRY_USER_MAIL/g; \
- s/\$${NLoadControllers}/$$N_LOAD_CONTROLLER/g;" < $(DIR_HELM_VALUES)/cb-ci-local.yaml > $(MKFILE)/values.cb-ci-local.yaml
+ s/\$${NLoadControllers}/$$N_LOAD_CONTROLLER_HA/g;" < $(DIR_HELM_VALUES)/cb-ci-local.yaml > $(MKFILE)/values.cb-ci-local.yaml
  source .env && \
  helm upgrade --install cbci-local $(DIR_CHARTS)/cb-ci-local --create-namespace --namespace "$$CBCI_NS" \
  -f "$(MKFILE)/values.cb-ci-local.yaml"