bad commit

README.md

@@ -3,3 +3,12 @@ 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 
+
+good commit
+
+good
+

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

@@ -13,4 +13,4 @@ spec:
           value: "qa"
         - name: GPU_ENABLED
           value: "1"
-
+

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/payments/envs/prod-us/deployment.yml → argocd-apps-structure/apps/orders/envs/prod-eu/deployment.yml

@@ -10,7 +10,7 @@ spec:
       - name: webserver-simple
         env:
         - name: ENV
-          value: "prod-us"
+          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/invoices/envs/qa/settings.yml → argocd-apps-structure/apps/orders/envs/prod-eu/settings.yml

@@ -10,12 +10,12 @@ spec:
       - name: webserver-simple
         env:
         - name: UI_THEME
-          value: "light"
+          value: "dark"
         - name: CACHE_SIZE
           value: "2048kb"
         - name: PAGE_LIMIT
           value: "25"
         - name: SORTING
           value: "ascending"    
         - name: N_BUCKETS
-          value: "42"          
+          value: "42"          

argocd-apps-structure/apps/invoices/envs/qa/version.yml → argocd-apps-structure/apps/orders/envs/prod-eu/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/appsets/README.md

@@ -0,0 +1,2 @@
+## 说明
+在实际环境中，应该需要使用 cluster labels and the matrix generator 以控制哪些应用程序将被分配到哪些集群。

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/ForcemCS/gitops-cert-level-3-examples.git
       revision: HEAD
       directories:
       - path: argocd-apps-structure/apps/*/envs/prod-us
@@ -22,13 +22,13 @@ spec:
 
       # Source of the application manifests
       source:
-        repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git
+        repoURL: https://github.com/ForcemCS/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
+        name: cluster-2
         namespace: '{{index .path.segments 2}}-{{index .path.segments 4}}'
 
       # Sync policy

argocd-apps-structure/appsets/my-qa-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/ForcemCS/gitops-cert-level-3-examples.git
       revision: HEAD
       directories:
       - path: argocd-apps-structure/apps/*/envs/qa   
@@ -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/ForcemCS/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/ForcemCS/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/ForcemCS/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/ForcemCS/gitops-cert-level-3-examples.git
     targetRevision: HEAD
     path: argocd-apps-structure/appsets
   destination:

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

@@ -9,15 +9,15 @@ spec:
   generators:
   - pullRequest:
       github:
-        owner: codefresh-contrib
+        owner: ForcemCS
         repo: gitops-cert-level-3-examples
       requeueAfterSeconds: 180
   template:
     metadata:
       name: 'myapp-{{.branch}}'
     spec:
       source:
-        repoURL: 'https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git'
+        repoURL: 'https://github.com/ForcemCS/gitops-cert-level-3-examples.git'
         targetRevision: HEAD
         path: preview-environments/kustomize-preview-app/ 
         kustomize: