From ed52b8116061035e89e4bc438920925025d7dc63 Mon Sep 17 00:00:00 2001 From: Gerald Nunn Date: Sun, 15 Oct 2023 18:14:55 -0700 Subject: [PATCH] Fix links and add kustomization api/kind --- .../ROOT/examples/bluegreen/base/kustomization.yaml | 3 +++ .../overlays/analysistemplate/kustomization.yaml | 3 +++ .../modules/ROOT/examples/deploy/base/kustomization.yaml | 3 +++ .../modules/ROOT/pages/02-workshop-overview.adoc | 8 ++++---- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/documentation/modules/ROOT/examples/bluegreen/base/kustomization.yaml b/documentation/modules/ROOT/examples/bluegreen/base/kustomization.yaml index c6fae91..8849043 100644 --- a/documentation/modules/ROOT/examples/bluegreen/base/kustomization.yaml +++ b/documentation/modules/ROOT/examples/bluegreen/base/kustomization.yaml @@ -1,3 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + resources: - rollout.yaml - services.yaml diff --git a/documentation/modules/ROOT/examples/bluegreen/overlays/analysistemplate/kustomization.yaml b/documentation/modules/ROOT/examples/bluegreen/overlays/analysistemplate/kustomization.yaml index f59385b..20302c9 100644 --- a/documentation/modules/ROOT/examples/bluegreen/overlays/analysistemplate/kustomization.yaml +++ b/documentation/modules/ROOT/examples/bluegreen/overlays/analysistemplate/kustomization.yaml @@ -1,3 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 + kind: Kustomization + resources: - ../../base - analysistemplate.yaml diff --git a/documentation/modules/ROOT/examples/deploy/base/kustomization.yaml b/documentation/modules/ROOT/examples/deploy/base/kustomization.yaml index 85dacb5..3a44f42 100644 --- a/documentation/modules/ROOT/examples/deploy/base/kustomization.yaml +++ b/documentation/modules/ROOT/examples/deploy/base/kustomization.yaml @@ -1,3 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + resources: - deploy.yaml - route.yaml diff --git a/documentation/modules/ROOT/pages/02-workshop-overview.adoc b/documentation/modules/ROOT/pages/02-workshop-overview.adoc index c1ed2bf..49ba852 100644 --- a/documentation/modules/ROOT/pages/02-workshop-overview.adoc +++ b/documentation/modules/ROOT/pages/02-workshop-overview.adoc @@ -121,19 +121,19 @@ ls ./deploy/base You should see that there are four files in this directory. The `deploy.yaml`, `service.yaml` and `route.yaml` represent the Deployment, Service and OpenShift route for the application. -.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/code/deploy/base/deploy.yaml,window='_blank'] +.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/documentation/modules/ROOT/examples/deploy/base/deploy.yaml[deploy.yaml,window='_blank'] [source,yaml,subs="+macros,attributes+"] ---- include::ROOT:example$deploy/base/deploy.yaml[] ---- -.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/code/deploy/base/service.yaml,window='_blank'] +.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/documentation/modules/ROOT/examples/deploy/base/service.yaml[service.yaml,window='_blank'] [source,yaml,subs="+macros,attributes+"] ---- include::ROOT:example$deploy/base/service.yaml[] ---- -.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/code/deploy/base/route.yaml,window='_blank'] +.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/documentation/modules/ROOT/examples/deploy/base/route.yaml[route.yaml,window='_blank'] [source,yaml,subs="+macros,attributes+"] ---- include::ROOT:example$deploy/base/route.yaml[] @@ -148,7 +148,7 @@ There is a fourth file called `kustomization.yaml`, this file is used by the htt the management of Kubernetes manifests. Kustomize and Helm are the two most popular yaml management tools in GitOps and we use kustomize here to simplify our deployments. -.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/code/deploy/base/kustomization.yaml,window='_blank'] +.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/documentation/modules/ROOT/examples/deploy/base/kustomization.yaml[kustomization.yaml,window='_blank'] [source,yaml,subs="+macros,attributes+"] ---- include::ROOT:example$deploy/base/kustomization.yaml[]