Use generators

kostis-codefresh · Dec 28, 2022 · 5e5a0ec · 5e5a0ec
1 parent 8acf7c9
commit 5e5a0ec
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 179 deletions.
diff --git a/environment-promotion/base/deployment.yml b/environment-promotion/base/deployment.yml
@@ -24,4 +24,7 @@ spec:
         env:
         - name: REGION
           value: "us"
+        envFrom:
+        - configMapRef:
+            name: example-configmap  
 
diff --git a/environment-promotion/envs/prod/application.properties b/environment-promotion/envs/prod/application.properties
@@ -0,0 +1,7 @@
+UI_THEME=dark
+CACHE_SIZE=1024kb
+PAGE_LIMIT=25
+SORTING=ascending
+N_BUCKETS=12
+
+
diff --git a/environment-promotion/envs/prod/kustomization.yml b/environment-promotion/envs/prod/kustomization.yml
@@ -14,6 +14,12 @@ patchesStrategicMerge:
 - deployment.yml
 - version.yml
 - replicas.yml
-- settings.yml
 - service.yml
 
+
+configMapGenerator:
+- name: example-configmap
+  behavior: merge
+  envs:
+  - application.properties
+
diff --git a/environment-promotion/envs/prod/settings.yml b/environment-promotion/envs/prod/settings.yml
diff --git a/environment-promotion/envs/qa/application.properties b/environment-promotion/envs/qa/application.properties
@@ -1,2 +1,5 @@
-SHARED=QA
-EXTRA=QA
+UI_THEME=light
+CACHE_SIZE=2048kb
+PAGE_LIMIT=25
+SORTING=ascending
+N_BUCKETS=42
diff --git a/environment-promotion/envs/qa/kustomization.yml b/environment-promotion/envs/qa/kustomization.yml
@@ -13,7 +13,6 @@ components:
 patchesStrategicMerge:
 - deployment.yml
 - version.yml
-- settings.yml
 - service.yml
 
 configMapGenerator:

diff --git a/environment-promotion/envs/qa/settings.yml b/environment-promotion/envs/qa/settings.yml
diff --git a/environment-promotion/envs/staging/application.properties b/environment-promotion/envs/staging/application.properties
@@ -1,2 +1,7 @@
-SHARED=STAGING
-EXTRA=STAGING
+UI_THEME=light
+CACHE_SIZE=1024kb
+PAGE_LIMIT=25
+SORTING=ascending
+N_BUCKETS=24
+
+
diff --git a/environment-promotion/envs/staging/kustomization.yml b/environment-promotion/envs/staging/kustomization.yml
@@ -14,7 +14,6 @@ patchesStrategicMerge:
 - deployment.yml
 - version.yml
 - replicas.yml
-- settings.yml
 - service.yml
 
 configMapGenerator:

diff --git a/environment-promotion/envs/staging/settings.yml b/environment-promotion/envs/staging/settings.yml
diff --git a/environment-promotion/qa.yml b/environment-promotion/qa.yml
diff --git a/environment-promotion/variants/non-prod/application.properties b/environment-promotion/variants/non-prod/application.properties
@@ -1,2 +1,4 @@
-SHARED=NO_PROD
-LAST=NO_PROD
+ENV_TYPE=non-prod
+PAYPAL_URL=staging2.paypal.com
+DB_USER=non-prod-user
+DB_PASSWORD=non-prod-password
diff --git a/environment-promotion/variants/non-prod/kustomization.yml b/environment-promotion/variants/non-prod/kustomization.yml
@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 patchesStrategicMerge:
-- non-prod.yml
 - replicas.yml
 
 

diff --git a/environment-promotion/variants/non-prod/non-prod.yml b/environment-promotion/variants/non-prod/non-prod.yml
diff --git a/environment-promotion/variants/prod/application.properties b/environment-promotion/variants/prod/application.properties
@@ -0,0 +1,6 @@
+ENV_TYPE=production
+PAYPAL_URL=production.paypal.com
+DB_USER=prod_username
+DB_PASSWORD=prod_password
+
+
diff --git a/environment-promotion/variants/prod/kustomization.yml b/environment-promotion/variants/prod/kustomization.yml
@@ -4,3 +4,7 @@ kind: Component
 patchesStrategicMerge:
 - prod.yml
 
+configMapGenerator:
+- name: example-configmap
+  envs:
+  - application.properties
diff --git a/environment-promotion/variants/prod/prod.yml b/environment-promotion/variants/prod/prod.yml
@@ -7,16 +7,7 @@ spec:
   template:
     spec:
       containers:
-      - name: webserver-simple
-        env:
-        - name: ENV_TYPE
-          value: "production"
-        - name: PAYPAL_URL
-          value: "production.paypal.com"   
-        - name: DB_USER
-          value: "prod_username"
-        - name: DB_PASSWORD
-          value: "prod_password"                     
+      - name: webserver-simple                   
         livenessProbe:
           httpGet:
             path: /health