From cd037ff1cd73bed0e85d53f1c5ee5f97828f8b44 Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Mon, 11 Mar 2024 11:27:57 -0400 Subject: [PATCH 1/9] sync all apps Signed-off-by: Alexandre Gaudreault --- .gitignore | 1 + apps/templates/applications.yaml | 29 +++++++++++++++++++ apps/templates/helm-guestbook.yaml | 16 ----------- apps/templates/helm-hooks.yaml | 17 ------------ apps/templates/kustomize-guestbook.yaml | 16 ----------- apps/templates/namespaces.yaml | 27 ------------------ apps/templates/sync-waves.yaml | 16 ----------- apps/values.yaml | 37 +++++++++++++++++++++---- 8 files changed, 61 insertions(+), 98 deletions(-) create mode 100644 .gitignore create mode 100644 apps/templates/applications.yaml delete mode 100644 apps/templates/helm-guestbook.yaml delete mode 100644 apps/templates/helm-hooks.yaml delete mode 100644 apps/templates/kustomize-guestbook.yaml delete mode 100644 apps/templates/namespaces.yaml delete mode 100644 apps/templates/sync-waves.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..db6e1b5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/**/charts/ diff --git a/apps/templates/applications.yaml b/apps/templates/applications.yaml new file mode 100644 index 0000000..7bdb0a6 --- /dev/null +++ b/apps/templates/applications.yaml @@ -0,0 +1,29 @@ +{{- range .Values.applications }} +{{- $config := $.Values.config -}} +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: {{ printf "example.%s" .name | quote }} + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: {{ .namespace | default .name | quote }} + server: {{ $config.spec.destination.server | quote }} + project: default + source: + path: {{ .path | default .name | quote }} + repoURL: {{ $config.spec.source.repoURL }} + targetRevision: {{ $config.spec.source.targetRevision }} + {{- with .tool }} + {{- . | toYaml | nindent 4 }} + {{- end }} + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true +--- +{{ end -}} diff --git a/apps/templates/helm-guestbook.yaml b/apps/templates/helm-guestbook.yaml deleted file mode 100644 index e1e5a8b..0000000 --- a/apps/templates/helm-guestbook.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: helm-guestbook - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: helm-guestbook - server: {{ .Values.spec.destination.server }} - project: default - source: - path: helm-guestbook - repoURL: {{ .Values.spec.source.repoURL }} - targetRevision: {{ .Values.spec.source.targetRevision }} diff --git a/apps/templates/helm-hooks.yaml b/apps/templates/helm-hooks.yaml deleted file mode 100644 index 5f65a8d..0000000 --- a/apps/templates/helm-hooks.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: helm-hooks - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: helm-hooks - server: {{ .Values.spec.destination.server }} - project: default - source: - path: helm-hooks - repoURL: {{ .Values.spec.source.repoURL }} - targetRevision: {{ .Values.spec.source.targetRevision }} - diff --git a/apps/templates/kustomize-guestbook.yaml b/apps/templates/kustomize-guestbook.yaml deleted file mode 100644 index 7a36476..0000000 --- a/apps/templates/kustomize-guestbook.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: kustomize-guestbook - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: kustomize-guestbook - server: {{ .Values.spec.destination.server }} - project: default - source: - path: kustomize-guestbook - repoURL: {{ .Values.spec.source.repoURL }} - targetRevision: {{ .Values.spec.source.targetRevision }} diff --git a/apps/templates/namespaces.yaml b/apps/templates/namespaces.yaml deleted file mode 100644 index 435e4ba..0000000 --- a/apps/templates/namespaces.yaml +++ /dev/null @@ -1,27 +0,0 @@ -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" diff --git a/apps/templates/sync-waves.yaml b/apps/templates/sync-waves.yaml deleted file mode 100644 index 24dbc9b..0000000 --- a/apps/templates/sync-waves.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: sync-waves - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: sync-waves - server: {{ .Values.spec.destination.server }} - project: default - source: - path: sync-waves - repoURL: {{ .Values.spec.source.repoURL }} - targetRevision: {{ .Values.spec.source.targetRevision }} diff --git a/apps/values.yaml b/apps/values.yaml index cd66cc0..bdf16da 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -1,6 +1,31 @@ -spec: - destination: - server: https://kubernetes.default.svc - source: - repoURL: https://github.com/argoproj/argocd-example-apps - targetRevision: HEAD \ No newline at end of file +config: + spec: + destination: + server: https://kubernetes.default.svc + source: + repoURL: https://github.com/argoproj/argocd-example-apps + targetRevision: HEAD + +applications: + - name: blue-green + - name: guestbook + - name: helm-dependency + - name: helm-guestbook + - name: helm-hooks + - name: jsonnet-guestbook + - name: jsonnet-guestbook-tla + - name: ksonnet-guestbook + - name: kustomize-guestbook + - name: plugin-kasane + path: plugins/kasane + tool: + plugin: + name: kasane + - name: plugin-kustomized-helm + path: plugins/kustomized-helm + tool: + plugin: + name: kustomized-helm + - name: pre-post-sync + - name: sock-shop + - name: sync-waves From 59f62c3ed6ad131f1bc9055d9fe471e3f1ba1593 Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Mon, 11 Mar 2024 14:26:43 -0400 Subject: [PATCH 2/9] fix blue-green name Signed-off-by: Alexandre Gaudreault --- apps/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/values.yaml b/apps/values.yaml index bdf16da..b9ee795 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -8,6 +8,9 @@ config: applications: - name: blue-green + tool: + helm: + releaseName: blue-green - name: guestbook - name: helm-dependency - name: helm-guestbook From aaeac99dae173538244a5f4c49e8257d6029b031 Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Mon, 11 Mar 2024 14:49:21 -0400 Subject: [PATCH 3/9] fix some apps Signed-off-by: Alexandre Gaudreault --- apps/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/values.yaml b/apps/values.yaml index b9ee795..60c20ec 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -13,7 +13,13 @@ applications: releaseName: blue-green - name: guestbook - name: helm-dependency + tool: + helm: + releaseName: helm-dependency - name: helm-guestbook + tool: + helm: + releaseName: helm-guestbook - name: helm-hooks - name: jsonnet-guestbook - name: jsonnet-guestbook-tla From 729e5913c32a289c919851e2c7ebeb7f7e12d133 Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Mon, 11 Mar 2024 15:15:54 -0400 Subject: [PATCH 4/9] remove deprecated ksonnet Signed-off-by: Alexandre Gaudreault --- apps/values.yaml | 1 - ksonnet-guestbook/.gitignore | 4 -- ksonnet-guestbook/app.yaml | 23 -------- .../components/guestbook-ui.jsonnet | 59 ------------------- ksonnet-guestbook/components/params.libsonnet | 18 ------ ksonnet-guestbook/environments/base.libsonnet | 4 -- .../environments/default/globals.libsonnet | 2 - .../environments/default/main.jsonnet | 8 --- .../environments/default/params.libsonnet | 17 ------ .../environments/dev/globals.libsonnet | 2 - .../environments/dev/main.jsonnet | 8 --- .../environments/dev/params.libsonnet | 17 ------ .../environments/prod/globals.libsonnet | 2 - .../environments/prod/main.jsonnet | 8 --- .../environments/prod/params.libsonnet | 17 ------ 15 files changed, 190 deletions(-) delete mode 100644 ksonnet-guestbook/.gitignore delete mode 100644 ksonnet-guestbook/app.yaml delete mode 100644 ksonnet-guestbook/components/guestbook-ui.jsonnet delete mode 100644 ksonnet-guestbook/components/params.libsonnet delete mode 100644 ksonnet-guestbook/environments/base.libsonnet delete mode 100644 ksonnet-guestbook/environments/default/globals.libsonnet delete mode 100644 ksonnet-guestbook/environments/default/main.jsonnet delete mode 100644 ksonnet-guestbook/environments/default/params.libsonnet delete mode 100644 ksonnet-guestbook/environments/dev/globals.libsonnet delete mode 100644 ksonnet-guestbook/environments/dev/main.jsonnet delete mode 100644 ksonnet-guestbook/environments/dev/params.libsonnet delete mode 100644 ksonnet-guestbook/environments/prod/globals.libsonnet delete mode 100644 ksonnet-guestbook/environments/prod/main.jsonnet delete mode 100644 ksonnet-guestbook/environments/prod/params.libsonnet diff --git a/apps/values.yaml b/apps/values.yaml index 60c20ec..3a14248 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -23,7 +23,6 @@ applications: - name: helm-hooks - name: jsonnet-guestbook - name: jsonnet-guestbook-tla - - name: ksonnet-guestbook - name: kustomize-guestbook - name: plugin-kasane path: plugins/kasane diff --git a/ksonnet-guestbook/.gitignore b/ksonnet-guestbook/.gitignore deleted file mode 100644 index f8714d3..0000000 --- a/ksonnet-guestbook/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/lib -/.ksonnet/registries -/app.override.yaml -/.ks_environment diff --git a/ksonnet-guestbook/app.yaml b/ksonnet-guestbook/app.yaml deleted file mode 100644 index 6fc0b6a..0000000 --- a/ksonnet-guestbook/app.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: 0.1.0 -environments: - default: - destination: - namespace: default - server: https://kubernetes.default.svc - k8sVersion: v1.10.0 - path: default - dev: - destination: - namespace: dev - server: https://kubernetes.default.svc - k8sVersion: v1.10.0 - path: dev - prod: - destination: - namespace: prod - server: https://kubernetes.default.svc - k8sVersion: v1.10.0 - path: prod -kind: ksonnet.io/app -name: guestbook -version: 0.0.1 diff --git a/ksonnet-guestbook/components/guestbook-ui.jsonnet b/ksonnet-guestbook/components/guestbook-ui.jsonnet deleted file mode 100644 index b615bdb..0000000 --- a/ksonnet-guestbook/components/guestbook-ui.jsonnet +++ /dev/null @@ -1,59 +0,0 @@ -local env = std.extVar("__ksonnet/environments"); -local params = std.extVar("__ksonnet/params").components["guestbook-ui"]; -[ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "name": params.name - }, - "spec": { - "ports": [ - { - "port": params.servicePort, - "targetPort": params.containerPort - } - ], - "selector": { - "app": params.name - }, - "type": params.type - } - }, - { - "apiVersion": "apps/v1", - "kind": "Deployment", - "metadata": { - "name": params.name - }, - "spec": { - "replicas": params.replicas, - "revisionHistoryLimit": 3, - "selector": { - "matchLabels": { - "app": params.name - }, - }, - "template": { - "metadata": { - "labels": { - "app": params.name - } - }, - "spec": { - "containers": [ - { - "image": params.image, - "name": params.name, - "ports": [ - { - "containerPort": params.containerPort - } - ] - } - ] - } - } - } - } -] diff --git a/ksonnet-guestbook/components/params.libsonnet b/ksonnet-guestbook/components/params.libsonnet deleted file mode 100644 index 162ad1f..0000000 --- a/ksonnet-guestbook/components/params.libsonnet +++ /dev/null @@ -1,18 +0,0 @@ -{ - global: { - // User-defined global parameters; accessible to all component and environments, Ex: - // replicas: 4, - }, - components: { - // Component-level parameters, defined initially from 'ks prototype use ...' - // Each object below should correspond to a component in the components/ directory - "guestbook-ui": { - containerPort: 80, - image: "gcr.io/heptio-images/ks-guestbook-demo:0.2", - name: "ks-guestbook-ui", - replicas: 1, - servicePort: 80, - type: "LoadBalancer", - }, - }, -} diff --git a/ksonnet-guestbook/environments/base.libsonnet b/ksonnet-guestbook/environments/base.libsonnet deleted file mode 100644 index a129aff..0000000 --- a/ksonnet-guestbook/environments/base.libsonnet +++ /dev/null @@ -1,4 +0,0 @@ -local components = std.extVar("__ksonnet/components"); -components + { - // Insert user-specified overrides here. -} diff --git a/ksonnet-guestbook/environments/default/globals.libsonnet b/ksonnet-guestbook/environments/default/globals.libsonnet deleted file mode 100644 index 7a73a41..0000000 --- a/ksonnet-guestbook/environments/default/globals.libsonnet +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/ksonnet-guestbook/environments/default/main.jsonnet b/ksonnet-guestbook/environments/default/main.jsonnet deleted file mode 100644 index 58695a8..0000000 --- a/ksonnet-guestbook/environments/default/main.jsonnet +++ /dev/null @@ -1,8 +0,0 @@ -local base = import "base.libsonnet"; -// uncomment if you reference ksonnet-lib -// local k = import "k.libsonnet"; - -base + { - // Insert user-specified overrides here. For example if a component is named \"nginx-deployment\", you might have something like:\n") - // "nginx-deployment"+: k.deployment.mixin.metadata.labels({foo: "bar"}) -} diff --git a/ksonnet-guestbook/environments/default/params.libsonnet b/ksonnet-guestbook/environments/default/params.libsonnet deleted file mode 100644 index b6eb32d..0000000 --- a/ksonnet-guestbook/environments/default/params.libsonnet +++ /dev/null @@ -1,17 +0,0 @@ -local params = std.extVar("__ksonnet/params"); -local globals = import "globals.libsonnet"; -local envParams = params + { - components +: { - // Insert component parameter overrides here. Ex: - // guestbook +: { - // name: "guestbook-dev", - // replicas: params.global.replicas, - // }, - }, -}; - -{ - components: { - [x]: envParams.components[x] + globals, for x in std.objectFields(envParams.components) - }, -} diff --git a/ksonnet-guestbook/environments/dev/globals.libsonnet b/ksonnet-guestbook/environments/dev/globals.libsonnet deleted file mode 100644 index 7a73a41..0000000 --- a/ksonnet-guestbook/environments/dev/globals.libsonnet +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/ksonnet-guestbook/environments/dev/main.jsonnet b/ksonnet-guestbook/environments/dev/main.jsonnet deleted file mode 100644 index 58695a8..0000000 --- a/ksonnet-guestbook/environments/dev/main.jsonnet +++ /dev/null @@ -1,8 +0,0 @@ -local base = import "base.libsonnet"; -// uncomment if you reference ksonnet-lib -// local k = import "k.libsonnet"; - -base + { - // Insert user-specified overrides here. For example if a component is named \"nginx-deployment\", you might have something like:\n") - // "nginx-deployment"+: k.deployment.mixin.metadata.labels({foo: "bar"}) -} diff --git a/ksonnet-guestbook/environments/dev/params.libsonnet b/ksonnet-guestbook/environments/dev/params.libsonnet deleted file mode 100644 index b6eb32d..0000000 --- a/ksonnet-guestbook/environments/dev/params.libsonnet +++ /dev/null @@ -1,17 +0,0 @@ -local params = std.extVar("__ksonnet/params"); -local globals = import "globals.libsonnet"; -local envParams = params + { - components +: { - // Insert component parameter overrides here. Ex: - // guestbook +: { - // name: "guestbook-dev", - // replicas: params.global.replicas, - // }, - }, -}; - -{ - components: { - [x]: envParams.components[x] + globals, for x in std.objectFields(envParams.components) - }, -} diff --git a/ksonnet-guestbook/environments/prod/globals.libsonnet b/ksonnet-guestbook/environments/prod/globals.libsonnet deleted file mode 100644 index 7a73a41..0000000 --- a/ksonnet-guestbook/environments/prod/globals.libsonnet +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/ksonnet-guestbook/environments/prod/main.jsonnet b/ksonnet-guestbook/environments/prod/main.jsonnet deleted file mode 100644 index 58695a8..0000000 --- a/ksonnet-guestbook/environments/prod/main.jsonnet +++ /dev/null @@ -1,8 +0,0 @@ -local base = import "base.libsonnet"; -// uncomment if you reference ksonnet-lib -// local k = import "k.libsonnet"; - -base + { - // Insert user-specified overrides here. For example if a component is named \"nginx-deployment\", you might have something like:\n") - // "nginx-deployment"+: k.deployment.mixin.metadata.labels({foo: "bar"}) -} diff --git a/ksonnet-guestbook/environments/prod/params.libsonnet b/ksonnet-guestbook/environments/prod/params.libsonnet deleted file mode 100644 index b6eb32d..0000000 --- a/ksonnet-guestbook/environments/prod/params.libsonnet +++ /dev/null @@ -1,17 +0,0 @@ -local params = std.extVar("__ksonnet/params"); -local globals = import "globals.libsonnet"; -local envParams = params + { - components +: { - // Insert component parameter overrides here. Ex: - // guestbook +: { - // name: "guestbook-dev", - // replicas: params.global.replicas, - // }, - }, -}; - -{ - components: { - [x]: envParams.components[x] + globals, for x in std.objectFields(envParams.components) - }, -} From 20ee623190ca73d62a64ade3c697c0c2ffe35478 Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Mon, 11 Mar 2024 15:16:14 -0400 Subject: [PATCH 5/9] use ingress to save cost Signed-off-by: Alexandre Gaudreault --- sock-shop/base/front-end-ingress.yaml | 23 +++++++++++++++++++++++ sock-shop/base/front-end-svc.yaml | 7 +++---- 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 sock-shop/base/front-end-ingress.yaml diff --git a/sock-shop/base/front-end-ingress.yaml b/sock-shop/base/front-end-ingress.yaml new file mode 100644 index 0000000..b79f0f0 --- /dev/null +++ b/sock-shop/base/front-end-ingress.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: front-end-ingress + labels: + name: front-end + annotations: + ingress.kubernetes.io/proxy-body-size: 100M + ingress.kubernetes.io/app-root: '/' +spec: + ingressClassName: nginx + rules: + - host: sockshop.apps.argoproj.io + http: + paths: + - path: / + pathType: ImplementationSpecific + backend: + service: + name: front-end + port: + number: 80 diff --git a/sock-shop/base/front-end-svc.yaml b/sock-shop/base/front-end-svc.yaml index 5249bb4..496b490 100644 --- a/sock-shop/base/front-end-svc.yaml +++ b/sock-shop/base/front-end-svc.yaml @@ -6,10 +6,9 @@ metadata: labels: name: front-end spec: - type: LoadBalancer + type: ClusterIP ports: - - port: 80 - targetPort: 8079 - nodePort: 30001 + - port: 80 + targetPort: 8079 selector: name: front-end From d2fa3c4117b1b2865fa64a48e51b8d489b18d47f Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Mon, 11 Mar 2024 15:22:20 -0400 Subject: [PATCH 6/9] sync current apps until stable Signed-off-by: Alexandre Gaudreault --- apps/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/values.yaml b/apps/values.yaml index 3a14248..48de1c6 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -3,8 +3,8 @@ config: destination: server: https://kubernetes.default.svc source: - repoURL: https://github.com/argoproj/argocd-example-apps - targetRevision: HEAD + repoURL: https://github.com/agaudreault/argocd-example-apps + targetRevision: sync-from-demo applications: - name: blue-green From 25274a1854e4da5ac5f6bf70483356c0c5db3a42 Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Mon, 11 Mar 2024 15:29:27 -0400 Subject: [PATCH 7/9] add kustomization Signed-off-by: Alexandre Gaudreault --- sock-shop/kustomization.yaml | 55 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/sock-shop/kustomization.yaml b/sock-shop/kustomization.yaml index bcc3578..da5e0f3 100644 --- a/sock-shop/kustomization.yaml +++ b/sock-shop/kustomization.yaml @@ -1,28 +1,29 @@ resources: -- base/carts-db-dep.yaml -- base/carts-db-svc.yaml -- base/carts-dep.yaml -- base/catalogue-db-dep.yaml -- base/catalogue-db-svc.yaml -- base/catalogue-dep.yaml -- base/catalogue-svc.yaml -- base/front-end-dep.yaml -- base/front-end-svc.yaml -- base/orders-db-dep.yaml -- base/orders-db-svc.yaml -- base/orders-dep.yaml -- base/orders-svc.yaml -- base/payment-dep.yaml -- base/payment-svc.yaml -- base/queue-master-dep.yaml -- base/queue-master-svc.yaml -- base/rabbitmq-dep.yaml -- base/rabbitmq-svc.yaml -- base/session-db-dep.yaml -- base/session-db-svc.yaml -- base/shipping-dep.yaml -- base/shipping-svc.yaml -- base/user-db-dep.yaml -- base/user-db-svc.yaml -- base/user-dep.yaml -- base/user-svc.yaml \ No newline at end of file + - base/carts-db-dep.yaml + - base/carts-db-svc.yaml + - base/carts-dep.yaml + - base/catalogue-db-dep.yaml + - base/catalogue-db-svc.yaml + - base/catalogue-dep.yaml + - base/catalogue-svc.yaml + - base/front-end-dep.yaml + - base/front-end-ingress.yaml + - base/front-end-svc.yaml + - base/orders-db-dep.yaml + - base/orders-db-svc.yaml + - base/orders-dep.yaml + - base/orders-svc.yaml + - base/payment-dep.yaml + - base/payment-svc.yaml + - base/queue-master-dep.yaml + - base/queue-master-svc.yaml + - base/rabbitmq-dep.yaml + - base/rabbitmq-svc.yaml + - base/session-db-dep.yaml + - base/session-db-svc.yaml + - base/shipping-dep.yaml + - base/shipping-svc.yaml + - base/user-db-dep.yaml + - base/user-db-svc.yaml + - base/user-dep.yaml + - base/user-svc.yaml From 79d3507bb28bff4047fd08350958f6e01f34de9f Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Wed, 20 Mar 2024 11:40:16 -0400 Subject: [PATCH 8/9] break Signed-off-by: Alexandre Gaudreault --- helm-dependency/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helm-dependency/values.yaml b/helm-dependency/values.yaml index a954a18..7f4aaee 100644 --- a/helm-dependency/values.yaml +++ b/helm-dependency/values.yaml @@ -1,4 +1,6 @@ wordpress: + image: + tag: invalid #break this app on purpose until a dedicated broken app is created wordpressPassword: foo mariadb: db: From 0d6bc4b38729c1be0b2cc2b1345f1d9360cbc805 Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Wed, 20 Mar 2024 15:49:46 -0400 Subject: [PATCH 9/9] update readme Signed-off-by: Alexandre Gaudreault --- README.md | 60 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 9b0ec34..7f871fe 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,48 @@ This repository contains example applications for demoing ArgoCD functionality. to register this repository to your ArgoCD instance, or fork this repo and push your own commits to explore ArgoCD and GitOps! -| Application | Description | -|-------------|-------------| -| [guestbook](guestbook/) | A hello word guestbook app as plain YAML | -| [ksonnet-guestbook](ksonnet-guestbook/) | The guestbook app as a ksonnet app | -| [helm-guestbook](helm-guestbook/) | The guestbook app as a Helm chart | -| [jsonnet-guestbook](jsonnet-guestbook/) | The guestbook app as a raw jsonnet | -| [jsonnet-guestbook-tla](jsonnet-guestbook-tla/) | The guestbook app as a raw jsonnet with support for top level arguments | -| [kustomize-guestbook](kustomize-guestbook/) | The guestbook app 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 app (https://microservices-demo.github.io) | -| [plugins](plugins/) | Apps which demonstrate config management plugins usage | -| [blue-green](blue-green/) | Demonstrates how to implement blue-green deployment using [Argo Rollouts](https://github.com/argoproj/argo-rollouts) -| [apps](apps/) | An app composed of other apps | +| Status | Application | Description | +| ------------------------------------------------------------------------- | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | +| [![App Status][badge_sync_example_apps]][app_sync_example_apps] | [apps](apps/) | An app composed of other apps synchronized in [cd.apps.argoproj.io][app_sync_example_apps] | +| [![App Status][badge_blue_green]][app_blue_green] | [blue-green](blue-green/) | Demonstrates how to implement blue-green deployment using [Argo Rollouts](https://github.com/argoproj/argo-rollouts) | +| [![App Status][badge_guestbook]][app_guestbook] | [guestbook](guestbook/) | A hello word guestbook app as plain YAML | +| [![App Status][badge_helm_dependency]][app_helm_dependency] | [helm-dependency](helm-dependency/) | Demonstrates how to customize an OTS (off-the-shelf) helm chart from an upstream repo | +| [![App Status][badge_helm_guestbook]][app_helm_guestbook] | [helm-guestbook](helm-guestbook/) | The guestbook app as a Helm chart | +| [![App Status][badge_helm_hooks]][app_helm_hooks] | [helm-hooks](helm-hooks/) | An application with native Helm hooks | +| [![App Status][badge_jsonnet_guestbook]][app_jsonnet_guestbook] | [jsonnet-guestbook](jsonnet-guestbook/) | The guestbook app as a raw jsonnet | +| [![App Status][badge_jsonnet_guestbook_tla]][app_jsonnet_guestbook_tla] | [jsonnet-guestbook-tla](jsonnet-guestbook-tla/) | The guestbook app as a raw jsonnet with support for top level arguments | +| [![App Status][badge_kustomize_guestbook]][app_kustomize_guestbook] | [kustomize-guestbook](kustomize-guestbook/) | The guestbook app as a Kustomize app | +| [![App Status][badge_plugin_kasane]][app_plugin_kasane] | [plugins/kasane](plugins/kasane) | Apps which demonstrate config management plugins usage with [kasane](plugins/kasane/README.md) | +| [![App Status][badge_plugin_kustomized_helm]][app_plugin_kustomized_helm] | [plugins/kustomized-helm](plugins/kustomized-helm) | Apps which demonstrate config management plugins usage with a [kustomized helm chart](plugins/kustomized-helm/README.md) | +| [![App Status][badge_pre_post_sync]][app_pre_post_sync] | [pre-post-sync](pre-post-sync/) | Demonstrates Argo CD PreSync and PostSync hooks | +| [![App Status][badge_sock_shop]][app_sock_shop] | [sock-shop](sock-shop/) | A microservices demo app (https://microservices-demo.github.io) | +| [![App Status][badge_sync_waves]][app_sync_waves] | [sync-waves](sync-waves/) | Demonstrates Argo CD sync waves with hooks | + +[app_sync_example_apps]: https://cd.apps.argoproj.io/applications/sync-example-apps +[badge_sync_example_apps]: https://cd.apps.argoproj.io/api/badge?revision=true&name=sync-example-apps +[app_blue_green]: https://cd.apps.argoproj.io/applications/example.blue-green +[badge_blue_green]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.blue-green +[app_guestbook]: https://cd.apps.argoproj.io/applications/example.guestbook +[badge_guestbook]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.guestbook +[app_helm_dependency]: https://cd.apps.argoproj.io/applications/example.helm-dependency +[badge_helm_dependency]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.helm-dependency +[app_helm_guestbook]: https://cd.apps.argoproj.io/applications/example.helm-guestbook +[badge_helm_guestbook]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.helm-guestbook +[app_helm_hooks]: https://cd.apps.argoproj.io/applications/example.helm-hooks +[badge_helm_hooks]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.helm-hooks +[app_jsonnet_guestbook]: https://cd.apps.argoproj.io/applications/example.jsonnet-guestbook +[badge_jsonnet_guestbook]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.jsonnet-guestbook +[app_jsonnet_guestbook_tla]: https://cd.apps.argoproj.io/applications/example.jsonnet-guestbook-tla +[badge_jsonnet_guestbook_tla]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.jsonnet-guestbook-tla +[app_kustomize_guestbook]: https://cd.apps.argoproj.io/applications/example.kustomize-guestbook +[badge_kustomize_guestbook]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.kustomize-guestbook +[app_plugin_kasane]: https://cd.apps.argoproj.io/applications/example.plugin-kasane +[badge_plugin_kasane]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.plugin-kasane +[app_plugin_kustomized_helm]: https://cd.apps.argoproj.io/applications/example.plugin-kustomized-helm +[badge_plugin_kustomized_helm]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.plugin-kustomized-helm +[app_pre_post_sync]: https://cd.apps.argoproj.io/applications/example.pre-post-sync +[badge_pre_post_sync]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.pre-post-sync +[app_sock_shop]: https://cd.apps.argoproj.io/applications/example.sock-shop +[badge_sock_shop]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.sock-shop +[app_sync_waves]: https://cd.apps.argoproj.io/applications/example.sync-waves +[badge_sync_waves]: https://cd.apps.argoproj.io/api/badge?revision=true&name=example.sync-waves