Merge 3abafe0361 into d7927a27b4

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

app-of-apps-kustomize/base/config.env

@@ -0,0 +1,4 @@
+SERVER=https://kubernetes.default.svc
+REPO_URL=https://github.com/argoproj/argocd-example-apps
+TARGET_REVISION=HEADs
+PROJECT=default

app-of-apps-kustomize/base/helm-guestbook.yaml

@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: helm-guestbook
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: helm-guestbook
+    server: $(SERVER)
+  project: $(PROJECT)
+  source:
+    path: helm-guestbook
+    repoURL: $(REPO_URL)
+    targetRevision: $(TARGET_REVISION)

app-of-apps-kustomize/base/helm-hooks.yaml

@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: helm-hooks
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: helm-hooks
+    server: $(SERVER)
+  project: $(PROJECT)
+  source:
+    path: helm-hooks
+    repoURL: $(REPO_URL)
+    targetRevision: $(TARGET_REVISION)

app-of-apps-kustomize/base/kustomization.yaml

@@ -0,0 +1,47 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configurations:
+- kustomize-argocd-config.yaml
+
+resources:
+- helm-guestbook.yaml
+- helm-hooks.yaml
+- kustomize-guestbook.yaml
+- namespaces.yaml
+- sync-waves.yaml
+
+configMapGenerator:
+  - name: argocd-env
+    envs:
+      - config.env
+
+vars:
+- name: SERVER
+  objref:
+    kind: ConfigMap
+    name: argocd-env
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.SERVER
+- name: TARGET_REVISION
+  objref:
+    kind: ConfigMap
+    name: argocd-env
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.TARGET_REVISION
+- name: PROJECT
+  objref:
+    kind: ConfigMap
+    name: argocd-env
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.PROJECT
+- name: REPO_URL
+  objref:
+    kind: ConfigMap
+    name: argocd-env
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.REPO_URL

app-of-apps-kustomize/base/kustomize-argocd-config.yaml

@@ -0,0 +1,13 @@
+varReference:
+- path: spec/destination/namespace
+  kind: Application
+  apiVersion: argoproj.io/v1alpha1
+- path: spec/destination/server
+  kind: Application
+  apiVersion: argoproj.io/v1alpha1
+- path: spec/project
+  kind: Application
+  apiVersion: argoproj.io/v1alpha1
+- path: spec/source/targetRevision
+  kind: Application
+  apiVersion: argoproj.io/v1alpha1

app-of-apps-kustomize/base/kustomize-guestbook.yaml

@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: kustomize-guestbook
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: kustomize-guestbook
+    server: $(SERVER)
+  project: $(PROJECT)
+  source:
+    path: kustomize-guestbook
+    repoURL: $(REPO_URL)
+    targetRevision: $(TARGET_REVISION)

app-of-apps-kustomize/base/namespaces.yaml

@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: helm-guestbook
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: helm-hooks
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kustomize-guestbook
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: sync-waves
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"

app-of-apps-kustomize/base/sync-waves.yaml

@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: sync-waves
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: sync-waves
+    server: $(SERVER)
+  project: $(PROJECT)
+  source:
+    path: sync-waves
+    repoURL: $(REPO_URL)
+    targetRevision: $(TARGET_REVISION)

helm-guestbook/templates/deployment.yaml

@@ -26,7 +26,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: {{ .Values.containerPort }}
               protocol: TCP
           livenessProbe:
             httpGet:

helm-guestbook/values.yaml

@@ -9,6 +9,8 @@ image:
   tag: 0.1
   pullPolicy: IfNotPresent
 
+containerPort: 80
+
 service:
   type: ClusterIP
   port: 80