Merge branch 'master' into dev

Jenkinsfile

@@ -16,11 +16,10 @@ node {
                sh 'argocd app list'
 //               """
             }
-      }       
-    }
-      
-    
-    stage('Create app') {
+//      }       
+    }   
+
+      stage('Create app') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             sh """
             argocd app create ${env.BRANCH_NAME}-kustomize-guestbook \

kustomize-guestbook/base/argo-app.yaml

@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: guestbook
+  namespace: argocd
+  # finalizers:
+  # - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: kustomize-guestbook
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    path: kustomize-guestbook
+    repoURL: https://github.com/radtac-craft/argocd-example-apps.git
+    targetRevision: HEAD

kustomize-guestbook/base/ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: kustomize-guestbook-ingress
+  name: guestbook-ingress
   # namespace: guestbook
   labels:
     app.kubernetes.io/component: server

kustomize-guestbook/base/kustomization.yaml

@@ -1,8 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namePrefix: kustomize-
 
 resources:
 - guestbook-ui-deployment.yaml
 - guestbook-ui-svc.yaml
 - ingress.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+- argo-app.yaml

kustomize-guestbook/overlays/dev/argo-app.yaml

@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: guestbook
+  namespace: argocd
+  # finalizers:
+  # - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: dev-kustomize-guestbook
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    path: kustomize-guestbook/overlays/dev
+    repoURL: https://github.com/radtac-craft/argocd-example-apps.git
+    targetRevision: HEAD

kustomize-guestbook/overlays/dev/ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: kustomize-guestbook-ingress
+  name: guestbook-ingress
   namespace:
 spec:
   rules:

kustomize-guestbook/overlays/dev/kustomization.yaml

@@ -2,4 +2,5 @@ bases:
 - ../../base
 namePrefix: dev-
 patchesStrategicMerge:
-- ingress.yaml
+- ingress.yaml
+- argo-app.yaml

kustomize-guestbook/overlays/prod/argo-app.yaml

@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: guestbook
+  namespace: argocd
+  # finalizers:
+  # - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: prod-kustomize-guestbook
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    path: kustomize-guestbook/overlays/prod
+    repoURL: https://github.com/radtac-craft/argocd-example-apps.git
+    targetRevision: HEAD

kustomize-guestbook/overlays/prod/ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: kustomize-guestbook-ingress
+  name: guestbook-ingress
   namespace:
 spec:
   rules:

kustomize-guestbook/overlays/prod/kustomization.yaml

@@ -2,4 +2,5 @@ bases:
 - ../../base
 namePrefix: prod-
 patchesStrategicMerge:
-- ingress.yaml
+- ingress.yaml
+- argo-app.yaml