My billing feature lb

README.md

@@ -3,3 +3,10 @@ Codefresh GitOps Certification examples - Level 3 - GitOps Enterprise
 This repository contains examples for the ArgoCD/GitOps certification workshops (Level 3)
 
 Take the certification yourself at [https://codefresh.io/courses/get-gitops-certified/](https://learning.codefresh.io/)
+
+"bad commit -test "
+
+"good commit"
+
+"bad commit" 
+

argocd-apps-structure/apps/fake-invoices/envs/qa/kustomization.yml → argocd-apps-structure/apps/billing/envs/qa/prod-us/kustomization.yml

@@ -8,6 +8,6 @@ resources:
 patchesStrategicMerge:
 - deployment.yml
 - version.yml
+- replicas.yml
 - settings.yml
 
-

argocd-apps-structure/apps/billing/envs/qa/replicas.yml

@@ -0,0 +1,7 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: simple-deployment
+spec:
+  replicas: 2

argocd-apps-structure/apps/fake-invoices/envs/qa/settings.yml → argocd-apps-structure/apps/billing/envs/qa/settings.yml

@@ -10,9 +10,9 @@ spec:
       - name: webserver-simple
         env:
         - name: UI_THEME
-          value: "light"
+          value: "dark"
         - name: CACHE_SIZE
-          value: "2048kb"
+          value: "1024kb"
         - name: PAGE_LIMIT
           value: "25"
         - name: SORTING

argocd-apps-structure/apps/invoices/envs/qa/version.yml → argocd-apps-structure/apps/billing/envs/qa/version.yml

@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: webserver-simple
-        image: docker.io/kostiscodefresh/simple-env-app:1.0
+        image: docker.io/kostiscodefresh/simple-env-app:2.0

argocd-apps-structure/apps/invoices/envs/qa/deployment.yml → argocd-apps-structure/apps/orders/envs/prod-eu/deployment.yml

@@ -10,7 +10,7 @@ spec:
       - name: webserver-simple
         env:
         - name: ENV
-          value: "qa"
+          value: "prod-eu"
         - name: GPU_ENABLED
           value: "1"
 

argocd-apps-structure/apps/invoices/envs/qa/kustomization.yml → argocd-apps-structure/apps/orders/envs/prod-eu/kustomization.yml

@@ -1,14 +1,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-
 resources:
 - ../../base
 
 
 patchesStrategicMerge:
 - deployment.yml
 - version.yml
+- replicas.yml
 - settings.yml
 
-

argocd-apps-structure/apps/orders/envs/prod-eu/prod-us/deployment.yml

@@ -0,0 +1,16 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: simple-deployment
+spec:
+  template:
+    spec:
+      containers:
+      - name: webserver-simple
+        env:
+        - name: ENV
+          value: "prod-us"
+        - name: GPU_ENABLED
+          value: "1"
+

argocd-apps-structure/apps/orders/envs/prod-eu/prod-us/kustomization.yml

@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- ../../base
+
+
+patchesStrategicMerge:
+- deployment.yml
+- version.yml
+- replicas.yml
+- settings.yml
+

argocd-apps-structure/apps/orders/envs/prod-eu/prod-us/replicas.yml

@@ -0,0 +1,7 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: simple-deployment
+spec:
+  replicas: 10

argocd-apps-structure/apps/orders/envs/prod-eu/prod-us/settings.yml

@@ -0,0 +1,21 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: simple-deployment
+spec:
+  template:
+    spec:
+      containers:
+      - name: webserver-simple
+        env:
+        - name: UI_THEME
+          value: "dark"
+        - name: CACHE_SIZE
+          value: "1024kb"
+        - name: PAGE_LIMIT
+          value: "25"
+        - name: SORTING
+          value: "ascending"    
+        - name: N_BUCKETS
+          value: "42"          

argocd-apps-structure/apps/fake-invoices/envs/qa/version.yml → argocd-apps-structure/apps/orders/envs/prod-eu/prod-us/version.yml

@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: webserver-simple
-        image: docker.io/kostiscodefresh/simple-env-app:1.0
+        image: docker.io/kostiscodefresh/simple-env-app:2.0

argocd-apps-structure/apps/orders/envs/prod-eu/replicas.yml

@@ -0,0 +1,7 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: simple-deployment
+spec:
+  replicas: 10

argocd-apps-structure/apps/invoices/envs/qa/settings.yml → argocd-apps-structure/apps/orders/envs/prod-eu/settings.yml

@@ -10,7 +10,7 @@ spec:
       - name: webserver-simple
         env:
         - name: UI_THEME
-          value: "light"
+          value: "dark"
         - name: CACHE_SIZE
           value: "2048kb"
         - name: PAGE_LIMIT

argocd-apps-structure/apps/orders/envs/prod-eu/version.yml

@@ -0,0 +1,11 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: simple-deployment
+spec:
+  template:
+    spec:
+      containers:
+      - name: webserver-simple
+        image: docker.io/kostiscodefresh/simple-env-app:2.0

argocd-apps-structure/apps/payments/base/envs

@@ -0,0 +1 @@
+

argocd-apps-structure/apps/payments/envs/prod-eu/deployment.yml

@@ -13,4 +13,3 @@ spec:
           value: "prod-eu"
         - name: GPU_ENABLED
           value: "1"
-

argocd-apps-structure/apps/payments/envs/prod-eu/kustomization.yml

@@ -9,4 +9,3 @@ patchesStrategicMerge:
 - version.yml
 - replicas.yml
 - settings.yml
-

argocd-apps-structure/apps/payments/envs/prod-eu/replicas.yml

@@ -4,4 +4,4 @@ kind: Deployment
 metadata:
   name: simple-deployment
 spec:
-  replicas: 8
+  replicas: 8

argocd-apps-structure/apps/payments/envs/prod-eu/settings.yml

@@ -18,4 +18,4 @@ spec:
         - name: SORTING
           value: "ascending"    
         - name: N_BUCKETS
-          value: "42"          
+          value: "42"          

argocd-apps-structure/appsets/my-prod-appset.yml

@@ -8,7 +8,7 @@ spec:
   goTemplateOptions: ["missingkey=error"]
   generators:
   - git:
-      repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git
+      repoURL: https://github.com/Amikh/gitops-cert-level-3-examples.git
       revision: HEAD
       directories:
       - path: argocd-apps-structure/apps/*/envs/prod-us
@@ -22,14 +22,14 @@ spec:
 
       # Source of the application manifests
       source:
-        repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git
+        repoURL: https://github.com/Amikh/gitops-cert-level-3-examples.git
         targetRevision: HEAD
         path: '{{.path.path}}'
 
       # Destination cluster and namespace to deploy the application
       destination:
-        server: https://kubernetes.default.svc
-        namespace: '{{index .path.segments 2}}-{{index .path.segments 4}}'
+
+        name: cluster-2
 
       # Sync policy
       syncPolicy:

argocd-apps-structure/appsets/my-qa-appset.yml

@@ -8,10 +8,10 @@ spec:
   goTemplateOptions: ["missingkey=error"]
   generators:
   - git:
-      repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git
+      repoURL: https://github.com/Amikh/gitops-cert-level-3-examples.git
       revision: HEAD
       directories:
-      - path: argocd-apps-structure/apps/*/envs/qa   
+      - path: argocd-apps-structure/apps/*/envs/
   template:      
     metadata:
       name: '{{index .path.segments 2}}-{{index .path.segments 4}}'     
@@ -21,7 +21,7 @@ spec:
 
       # Source of the application manifests
       source:
-        repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git
+        repoURL: https://github.com/Amikh/gitops-cert-level-3-examples.git
         targetRevision: HEAD
         path: '{{.path.path}}'
 

argocd-apps-structure/appsets/my-staging-appset.yml

@@ -8,7 +8,7 @@ spec:
   goTemplateOptions: ["missingkey=error"]
   generators:
   - git:
-      repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git
+      repoURL: https://github.com/Amikh/gitops-cert-level-3-examples.git
       revision: HEAD
       directories:
       - path: argocd-apps-structure/apps/*/envs/staging    
@@ -21,7 +21,7 @@ spec:
 
       # Source of the application manifests
       source:
-        repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git
+        repoURL: https://github.com/Amikh/gitops-cert-level-3-examples.git
         targetRevision: HEAD
         path: '{{.path.path}}'
 

argocd-apps-structure/root-argocd-app.yml

@@ -6,7 +6,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git
+    repoURL: https://github.com/amikh/gitops-cert-level-3-examples.git
     targetRevision: HEAD
     path: argocd-apps-structure/appsets
   destination:

preview-environments/pr-generator/pr-generator.yml

@@ -2,24 +2,28 @@ apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
   name: my-preview-apps
-  namespace: argocd  
+
+  namespace: argocd
 spec:
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
   generators:
   - pullRequest:
       github:
-        owner: codefresh-contrib
+        owner: amikh
         repo: gitops-cert-level-3-examples
-      requeueAfterSeconds: 180
+        tokenRef:
+          secretName: github-token
+          key: token
+      requeueAfterSeconds: 1800
   template:
     metadata:
-      name: 'myapp-{{.branch}}'
+      name: 'myapp-{{.branch}}-{{.number}}'
     spec:
       source:
-        repoURL: 'https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git'
-        targetRevision: HEAD
-        path: preview-environments/kustomize-preview-app/ 
+        repoURL: 'https://github.com/amikh/gitops-cert-level-3-examples.git'
+        targetRevision: '{{.head_sha}}'
+        path: preview-environments/kustomize-preview-app/
         kustomize:
           images:
             - 'docker.io/kostiscodefresh/my-preview-app:{{.branch_slug}}'
@@ -29,6 +33,7 @@ spec:
         namespace: 'preview-{{.branch_slug}}'
       syncPolicy:
         automated:
-          prune: true  
+          prune: true
+          selfHeal: true
         syncOptions:
-        - CreateNamespace=true 
+        - CreateNamespace=true