diff --git a/README.md b/README.md index e5b96db..a222f74 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ to explore ArgoCD and GitOps! | [ksonnet-guestbook](ksonnet-guestbook/) | The guestbook application as a ksonnet app | | [helm-guestbook](helm-guestbook/) | The guestbook application as a Helm chart | | [jsonnet-guestbook](jsonnet-guestbook/) | The guestbook application as a raw jsonnet | -| [kustomize-guestbook](kustomize-guestbook/) | The guestbook application as a Kustomize 1 app | -| [kustomize2-guestbook](kustomize2-guestbook/) | The guestbook application as a Kustomize 2 app | +| [kustomize-guestbook](kustomize-guestbook/) | The guestbook application as a Kustomize app | | [pre-post-sync](pre-post-sync/) | Demonstrates Argo CD PreSync and PostSync hooks | | [helm-dependency](helm-dependency/) | Demonstrates how to customize an OTS (off-the-shelf) helm chart from an upstream repo | | [blue-green-deploy](blue-green-deploy/) | Demonstrates an Argo CD Sync hook which performs a blue/green deployment | diff --git a/kustomize2-guestbook/guestbook-ui-deployment.yaml b/kustomize-guestbook/guestbook-ui-deployment.yaml similarity index 100% rename from kustomize2-guestbook/guestbook-ui-deployment.yaml rename to kustomize-guestbook/guestbook-ui-deployment.yaml diff --git a/kustomize2-guestbook/guestbook-ui-svc.yaml b/kustomize-guestbook/guestbook-ui-svc.yaml similarity index 100% rename from kustomize2-guestbook/guestbook-ui-svc.yaml rename to kustomize-guestbook/guestbook-ui-svc.yaml diff --git a/kustomize-guestbook/kustomization.yaml b/kustomize-guestbook/kustomization.yaml index 526ff26..cbaba90 100644 --- a/kustomize-guestbook/kustomization.yaml +++ b/kustomize-guestbook/kustomization.yaml @@ -1,5 +1,7 @@ namePrefix: kustomize- resources: -- ../guestbook/guestbook-ui-deployment.yaml -- ../guestbook/guestbook-ui-svc.yaml +- guestbook-ui-deployment.yaml +- guestbook-ui-svc.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/kustomize2-guestbook/kustomization.yaml b/kustomize2-guestbook/kustomization.yaml deleted file mode 100644 index cbaba90..0000000 --- a/kustomize2-guestbook/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -namePrefix: kustomize- - -resources: -- guestbook-ui-deployment.yaml -- guestbook-ui-svc.yaml -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization diff --git a/pre-post-sync/guestbook-ui-deployment.yaml b/pre-post-sync/guestbook-ui-deployment.yaml new file mode 100644 index 0000000..f9b5a83 --- /dev/null +++ b/pre-post-sync/guestbook-ui-deployment.yaml @@ -0,0 +1,20 @@ +apiVersion: apps/v1beta2 +kind: Deployment +metadata: + name: guestbook-ui +spec: + replicas: 1 + revisionHistoryLimit: 3 + selector: + matchLabels: + app: guestbook-ui + template: + metadata: + labels: + app: guestbook-ui + spec: + containers: + - image: gcr.io/heptio-images/ks-guestbook-demo:0.2 + name: guestbook-ui + ports: + - containerPort: 80 diff --git a/pre-post-sync/guestbook-ui-svc.yaml b/pre-post-sync/guestbook-ui-svc.yaml new file mode 100644 index 0000000..e8a4a27 --- /dev/null +++ b/pre-post-sync/guestbook-ui-svc.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Service +metadata: + name: guestbook-ui +spec: + ports: + - port: 80 + targetPort: 80 + selector: + app: guestbook-ui diff --git a/pre-post-sync/kustomization.yaml b/pre-post-sync/kustomization.yaml index 35f8f92..cc5da56 100644 --- a/pre-post-sync/kustomization.yaml +++ b/pre-post-sync/kustomization.yaml @@ -1,7 +1,7 @@ namePrefix: pre-post-sync- resources: -- ../guestbook/guestbook-ui-deployment.yaml -- ../guestbook/guestbook-ui-svc.yaml +- guestbook-ui-deployment.yaml +- guestbook-ui-svc.yaml - pre-sync-job.yaml - post-sync-job.yaml