diff --git a/README.md b/README.md index 1be07ab..10e14d8 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ to explore ArgoCD and GitOps! | [jsonnet-guestbook](jsonnet-guestbook/) | The guestbook application as a raw jsonnet | | [kustomize-guestbook](kustomize-guestbook/) | The guestbook application as a Kustomize 2 app | | [pre-post-sync](pre-post-sync/) | Demonstrates Argo CD PreSync and PostSync hooks | +| [sync-waves](sync-waves/) | Demonstrates Argo CD sync waves with hooks | | [helm-dependency](helm-dependency/) | Demonstrates how to customize an OTS (off-the-shelf) helm chart from an upstream repo | | [sock-shop](sock-shop/) | A microservices demo application (https://microservices-demo.github.io) | | [plugins](plugins/) | Applications which demonstrate config management plugins usage | diff --git a/guestbook/guestbook-ui-deployment.yaml b/guestbook/guestbook-ui-deployment.yaml index f036896..f9b5a83 100644 --- a/guestbook/guestbook-ui-deployment.yaml +++ b/guestbook/guestbook-ui-deployment.yaml @@ -2,8 +2,6 @@ apiVersion: apps/v1beta2 kind: Deployment metadata: name: guestbook-ui - annotations: - argocd.argoproj.io/sync-wave: "80" spec: replicas: 1 revisionHistoryLimit: 3 @@ -16,13 +14,7 @@ spec: app: guestbook-ui spec: containers: - - image: gcr.io/heptio-images/ks-guestbook-demo:0.1 + - image: gcr.io/heptio-images/ks-guestbook-demo:0.2 name: guestbook-ui ports: - containerPort: 80 - readinessProbe: - exec: - command: - - "true" - initialDelaySeconds: 30 - periodSeconds: 30 \ No newline at end of file diff --git a/guestbook/guestbook-ui-svc.yaml b/guestbook/guestbook-ui-svc.yaml index 95d9487..e8a4a27 100644 --- a/guestbook/guestbook-ui-svc.yaml +++ b/guestbook/guestbook-ui-svc.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Service metadata: name: guestbook-ui - annotations: - argocd.argoproj.io/sync-wave: "81" spec: ports: - port: 80 diff --git a/sync-waves/manifests.yaml b/sync-waves/manifests.yaml index f264a19..5e4e14a 100644 --- a/sync-waves/manifests.yaml +++ b/sync-waves/manifests.yaml @@ -4,7 +4,7 @@ kind: Job metadata: name: upgrade-sql-schema annotations: - argocd.argoproj.io/hook: PostSync + argocd.argoproj.io/hook: PreSync spec: template: spec: