From 8824649bef0e6426c24dc20844a76807db3a90ba Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Tue, 20 Apr 2021 15:55:24 +0900 Subject: [PATCH 1/8] add argocd workflow --- templates/argo-cd/Dockerfile | 6 ++ templates/argo-cd/createapp-wftpl.yaml | 57 +++++++++++++++++++ workflows/{ => v1}/lma-federation-wf.yaml | 0 workflows/{ => v1}/lma-wf.yaml | 0 .../{ => v1}/openstack-components-wf.yaml | 0 workflows/{ => v1}/openstack-infra-wf.yaml | 0 workflows/{ => v1}/service-mesh-wf.yaml | 0 workflows/v2/lma-wf.yaml | 35 ++++++++++++ 8 files changed, 98 insertions(+) create mode 100644 templates/argo-cd/Dockerfile create mode 100644 templates/argo-cd/createapp-wftpl.yaml rename workflows/{ => v1}/lma-federation-wf.yaml (100%) rename workflows/{ => v1}/lma-wf.yaml (100%) rename workflows/{ => v1}/openstack-components-wf.yaml (100%) rename workflows/{ => v1}/openstack-infra-wf.yaml (100%) rename workflows/{ => v1}/service-mesh-wf.yaml (100%) create mode 100644 workflows/v2/lma-wf.yaml diff --git a/templates/argo-cd/Dockerfile b/templates/argo-cd/Dockerfile new file mode 100644 index 0000000..8c2907d --- /dev/null +++ b/templates/argo-cd/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine:3.7 +RUN apk update && apk add --no-cache curl bash + +WORKDIR /workspace +RUN curl -sSL -o /workspace/argocd https://github.com/argoproj/argo-cd/releases/download/v2.0.1/argocd-linux-amd64 +RUN chmod +x /workspace/argocd diff --git a/templates/argo-cd/createapp-wftpl.yaml b/templates/argo-cd/createapp-wftpl.yaml new file mode 100644 index 0000000..f8c4b8d --- /dev/null +++ b/templates/argo-cd/createapp-wftpl.yaml @@ -0,0 +1,57 @@ +apiVersion: argoproj.io/v1alpha1 +kind: WorkflowTemplate +metadata: + name: create-application +spec: + arguments: + parameters: + - name: repository_url + value: "https://github.com/openinfradev/decapod-site-cd" + - name: argo_server + value: "192.168.97.192:30080" + - name: argo_username + value: "admin" + - name: argo_password + value: "" + - name: site_name + value: "hanu-deploy-apps" + templates: + - name: createApp + inputs: + parameters: + - name: path + activeDeadlineSeconds: 900 + container: + name: 'create' + image: docker.io/sktdev/argocd:latest + command: + - /bin/bash + - -c + - | + set -e + # log into Argo CD server + ./argocd login $ARGO_SERVER --insecure --username $ARGO_USERNAME --password $ARGO_PASSWORD + + sleep 1000 + + env: + - name: PATH + value: "{{inputs.parameters.path}}" + - name: ARGO_SERVER + value: "{{workflow.parameters.argo_server}}" + - name: ARGO_USERNAME + value: "{{workflow.parameters.argo_username}}" + - name: ARGO_PASSWORD + value: "{{workflow.parameters.argo_password}}" + + - name: AppGroup + inputs: + parameters: + - name: list + steps: + - - name: "InstallAppGroup" + template: createApp + arguments: + parameters: + - {name: path, value: "{{item}}"} + withParam: "{{inputs.parameters.list}}" diff --git a/workflows/lma-federation-wf.yaml b/workflows/v1/lma-federation-wf.yaml similarity index 100% rename from workflows/lma-federation-wf.yaml rename to workflows/v1/lma-federation-wf.yaml diff --git a/workflows/lma-wf.yaml b/workflows/v1/lma-wf.yaml similarity index 100% rename from workflows/lma-wf.yaml rename to workflows/v1/lma-wf.yaml diff --git a/workflows/openstack-components-wf.yaml b/workflows/v1/openstack-components-wf.yaml similarity index 100% rename from workflows/openstack-components-wf.yaml rename to workflows/v1/openstack-components-wf.yaml diff --git a/workflows/openstack-infra-wf.yaml b/workflows/v1/openstack-infra-wf.yaml similarity index 100% rename from workflows/openstack-infra-wf.yaml rename to workflows/v1/openstack-infra-wf.yaml diff --git a/workflows/service-mesh-wf.yaml b/workflows/v1/service-mesh-wf.yaml similarity index 100% rename from workflows/service-mesh-wf.yaml rename to workflows/v1/service-mesh-wf.yaml diff --git a/workflows/v2/lma-wf.yaml b/workflows/v2/lma-wf.yaml new file mode 100644 index 0000000..3a1f24a --- /dev/null +++ b/workflows/v2/lma-wf.yaml @@ -0,0 +1,35 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Workflow +metadata: + generateName: lma- + namespace: argo +spec: + entrypoint: deploy + arguments: + parameters: + - name: repository_url + value: "https://github.com/openinfradev/decapod-site-cd" + - name: argo_server + value: "192.168.97.192:30080" + - name: argo_username + value: "admin" + - name: argo_password + value: "taco1130@" + - name: site_name + value: "hanu-deploy-apps" + templates: + - name: deploy + dag: + tasks: + - name: operator + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + "prometheus-operator" + ] + dependencies: [] \ No newline at end of file From 51958496723cc5d186560dfc2041d6d88f8719e5 Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Thu, 22 Apr 2021 12:27:26 +0900 Subject: [PATCH 2/8] implement workflowtemplates for argocd --- templates/argo-cd/createapp-wftpl.yaml | 43 ++++++++++++---------- templates/argo-cd/prepare-argocd.yaml | 51 ++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 19 deletions(-) create mode 100644 templates/argo-cd/prepare-argocd.yaml diff --git a/templates/argo-cd/createapp-wftpl.yaml b/templates/argo-cd/createapp-wftpl.yaml index f8c4b8d..eeec21c 100644 --- a/templates/argo-cd/createapp-wftpl.yaml +++ b/templates/argo-cd/createapp-wftpl.yaml @@ -5,21 +5,16 @@ metadata: spec: arguments: parameters: - - name: repository_url - value: "https://github.com/openinfradev/decapod-site-cd" - - name: argo_server - value: "192.168.97.192:30080" - - name: argo_username - value: "admin" - - name: argo_password - value: "" - name: site_name value: "hanu-deploy-apps" + - name: app_name + value: "lma" templates: - name: createApp inputs: parameters: - name: path + - name: namespace activeDeadlineSeconds: 900 container: name: 'create' @@ -28,21 +23,30 @@ spec: - /bin/bash - -c - | - set -e # log into Argo CD server ./argocd login $ARGO_SERVER --insecure --username $ARGO_USERNAME --password $ARGO_PASSWORD - sleep 1000 + # check if app already exists. + ./argocd app get $PATH + if [[ $? -ne 0 ]]; then + # create new application if not exists. + ./argocd app create $PATH --repo $REPO --path $SITE_NAME/$APP_NAME/$PATH --dest-namespace $NAMESPACE --dest-name $SITE_NAME --directory-recurse + fi + ./argocd app sync $PATH --async + ./argocd app wait $PATH --health + envFrom: + - secretRef: + name: "decapod-argocd-config" env: - - name: PATH - value: "{{inputs.parameters.path}}" - - name: ARGO_SERVER - value: "{{workflow.parameters.argo_server}}" - - name: ARGO_USERNAME - value: "{{workflow.parameters.argo_username}}" - - name: ARGO_PASSWORD - value: "{{workflow.parameters.argo_password}}" + - name: PATH + value: "{{inputs.parameters.path}}" + - name: SITE_NAME + value: "{{workflow.parameters.site_name}}" + - name: APP_NAME + value: "{{workflow.parameters.app_name}}" + - name: NAMESPACE + value: "{{inputs.parameters.namespace}}" - name: AppGroup inputs: @@ -53,5 +57,6 @@ spec: template: createApp arguments: parameters: - - {name: path, value: "{{item}}"} + - {name: path, value: "{{item.path}}"} + - {name: namespace, value: "{{item.namespace}}"} withParam: "{{inputs.parameters.list}}" diff --git a/templates/argo-cd/prepare-argocd.yaml b/templates/argo-cd/prepare-argocd.yaml new file mode 100644 index 0000000..5dd2488 --- /dev/null +++ b/templates/argo-cd/prepare-argocd.yaml @@ -0,0 +1,51 @@ +apiVersion: argoproj.io/v1alpha1 +kind: WorkflowTemplate +metadata: + name: prepare-argocd +spec: + startpoint: configuration + arguments: + parameters: + - name: repository_url + value: "https://github.com/openinfradev/decapod-site-cd" + - name: argo_server + value: "192.168.97.192:30080" + - name: argo_username + value: "admin" + - name: argo_password + value: "password" + - name: target_server + value: "https://kubernetes.default.svc" + templates: + - name: configuration + activeDeadlineSeconds: 120 + container: + name: 'config' + image: k8s.gcr.io/hyperkube:v1.18.8 + command: + - /bin/bash + - -c + - | + kubectl get secret decapod-argocd-config -nargo + + if [[ $? =~ 0 ]]; then + kubectl delete secret decapod-argocd-config -nargo + fi + + kubectl create secret generic decapod-argocd-config -nargo \ + --from-literal=ARGO_SERVER=$ARGO_SERVER \ + --from-literal=ARGO_USERNAME=$ARGO_USERNAME \ + --from-literal=ARGO_PASSWORD=$ARGO_PASSWORD \ + --from-literal=REPO=$REPO + + env: + - name: ARGO_SERVER + value: "{{workflow.parameters.argo_server}}" + - name: ARGO_USERNAME + value: "{{workflow.parameters.argo_username}}" + - name: ARGO_PASSWORD + value: "{{workflow.parameters.argo_password}}" + - name: REPO + value: "{{workflow.parameters.repository_url}}" + - name: TARGET_SERVER + value: "{{workflow.parameters.target_server}}" \ No newline at end of file From 2857f696b421526da0bbcfe4dd64e40c192a86ee Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Thu, 22 Apr 2021 12:27:58 +0900 Subject: [PATCH 3/8] added new workflows for decapod-v2 --- workflows/v2/lma-federation-wf.yaml | 104 ++++++++++++++++++++++ workflows/v2/lma-wf.yaml | 61 ++++++++++--- workflows/v2/openstack-components-wf.yaml | 71 +++++++++++++++ workflows/v2/openstack-infra-wf.yaml | 33 +++++++ workflows/v2/service-mesh-wf.yaml | 44 +++++++++ 5 files changed, 303 insertions(+), 10 deletions(-) create mode 100644 workflows/v2/lma-federation-wf.yaml create mode 100644 workflows/v2/openstack-components-wf.yaml create mode 100644 workflows/v2/openstack-infra-wf.yaml create mode 100644 workflows/v2/service-mesh-wf.yaml diff --git a/workflows/v2/lma-federation-wf.yaml b/workflows/v2/lma-federation-wf.yaml new file mode 100644 index 0000000..b86cabf --- /dev/null +++ b/workflows/v2/lma-federation-wf.yaml @@ -0,0 +1,104 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Workflow +metadata: + generateName: lma-federation- + namespace: argo +spec: + entrypoint: deploy + arguments: + parameters: + - name: site_name + value: "hanu-deploy-apps" + - name: app_name + value: "lma" + templates: + - name: deploy + dag: + tasks: + - name: operator + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "prometheus-operator", "namespace": "lma" }, + { "path": "eck-operator", "namespace": "lma" }, + { "path": "fluentbit-operator", "namespace": "lma" } + ] + dependencies: [] + - name: logging + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "eck-resource", "namespace": "lma" }, + { "path": "fluentbit", "namespace": "lma" }, + { "path": "kubernetes-event-exporter", "namespace": "lma" } + ] + dependencies: [operator] + - name: prepare-lma + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "thanos-config", "namespace": "lma" } + ] + dependencies: [operator] + + - name: prometheus + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "prometheus", "namespace": "lma" }, + { "path": "kube-state-metrics", "namespace": "lma" }, + { "path": "prometheus-process-exporter", "namespace": "lma" }, + { "path": "prometheus-pushgateway", "namespace": "lma" }, + { "path": "prometheus-node-exporter", "namespace": "lma" }, + { "path": "prometheus-adapter", "namespace": "lma" }, + { "path": "addons", "namespace": "lma" } + ] + dependencies: [prepare-lma] + + - name: federation + templateRef: + name: create-application + template: ChartGroup + arguments: + parameters: + - name: chart_list + value: | + [ + { "path": "prometheus-fed-master", "namespace": "fed" }, + { "path": "fed-addons", "namespace": "fed" }, + { "path": "thanos", "namespace": "fed" } + ] + dependencies: [prometheus,logging] + + - name: grafana + templateRef: + name: create-application + template: ChartGroup + arguments: + parameters: + - name: chart_list + value: | + [ + { "path": "grafana", "namespace": "fed" } + ] + dependencies: [federation] \ No newline at end of file diff --git a/workflows/v2/lma-wf.yaml b/workflows/v2/lma-wf.yaml index 3a1f24a..f5c1a4e 100644 --- a/workflows/v2/lma-wf.yaml +++ b/workflows/v2/lma-wf.yaml @@ -7,16 +7,10 @@ spec: entrypoint: deploy arguments: parameters: - - name: repository_url - value: "https://github.com/openinfradev/decapod-site-cd" - - name: argo_server - value: "192.168.97.192:30080" - - name: argo_username - value: "admin" - - name: argo_password - value: "taco1130@" - name: site_name value: "hanu-deploy-apps" + - name: app_name + value: "lma" templates: - name: deploy dag: @@ -30,6 +24,53 @@ spec: - name: list value: | [ - "prometheus-operator" + { "path": "prometheus-operator", "namespace": "lma" }, + { "path": "eck-operator", "namespace": "lma" }, + { "path": "fluentbit-operator", "namespace": "lma" } ] - dependencies: [] \ No newline at end of file + dependencies: [] + - name: logging + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "eck-resource", "namespace": "lma" }, + { "path": "fluentbit", "namespace": "lma" }, + { "path": "kubernetes-event-exporter", "namespace": "lma" } + ] + dependencies: [operator] + - name: prepare-lma + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "thanos-config", "namespace": "lma" } + ] + dependencies: [operator] + + - name: prometheus + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "prometheus", "namespace": "lma" }, + { "path": "kube-state-metrics", "namespace": "lma" }, + { "path": "prometheus-process-exporter", "namespace": "lma" }, + { "path": "prometheus-pushgateway", "namespace": "lma" }, + { "path": "prometheus-node-exporter", "namespace": "lma" }, + { "path": "prometheus-adapter", "namespace": "lma" }, + { "path": "addons", "namespace": "lma" } + ] + dependencies: [prepare-lma] diff --git a/workflows/v2/openstack-components-wf.yaml b/workflows/v2/openstack-components-wf.yaml new file mode 100644 index 0000000..adab687 --- /dev/null +++ b/workflows/v2/openstack-components-wf.yaml @@ -0,0 +1,71 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Workflow +metadata: + generateName: openstack-components- + namespace: argo +spec: + entrypoint: deploy + arguments: + parameters: + - name: site_name + value: "hanu-deploy-apps" + - name: app_name + value: "openstack" + templates: + - name: deploy + dag: + tasks: + - name: base + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "keystone", "namespace": "openstack" }, + { "path": "glance", "namespace": "openstack" }, + { "path": "cinder", "namespace": "openstack" } + ] + dependencies: [] + - name: compute-kit + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "libvirt", "namespace": "openstack" }, + { "path": "nova", "namespace": "openstack" }, + { "path": "neutron", "namespace": "openstack" } + ] + dependencies: [base] + - name: addon + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "horizon", "namespace": "openstack" }, + { "path": "heat", "namespace": "openstack" }, + { "path": "prometheus-openstack-exporter", "namespace": "openstack" } + ] + dependencies: [base,compute-kit] + - name: sona + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "horizon", "namespace": "openstack" }, + ] + dependencies: [addon] \ No newline at end of file diff --git a/workflows/v2/openstack-infra-wf.yaml b/workflows/v2/openstack-infra-wf.yaml new file mode 100644 index 0000000..0c8cfe9 --- /dev/null +++ b/workflows/v2/openstack-infra-wf.yaml @@ -0,0 +1,33 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Workflow +metadata: + generateName: openstack-infra- + namespace: argo +spec: + entrypoint: deploy + arguments: + parameters: + - name: site_name + value: "hanu-deploy-apps" + - name: app_name + value: "openstack" + templates: + - name: deploy + dag: + tasks: + - name: operator + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "ceph-provisioners", "namespace": "openstack" }, + { "path": "ingress", "namespace": "openstack" }, + { "path": "memcached", "namespace": "openstack" }, + { "path": "rabbitmq", "namespace": "openstack" }, + { "path": "mariadb", "namespace": "openstack" } + ] + dependencies: [] \ No newline at end of file diff --git a/workflows/v2/service-mesh-wf.yaml b/workflows/v2/service-mesh-wf.yaml new file mode 100644 index 0000000..79fbc0c --- /dev/null +++ b/workflows/v2/service-mesh-wf.yaml @@ -0,0 +1,44 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Workflow +metadata: + generateName: service-mesh- + namespace: argo +spec: + entrypoint: deploy + arguments: + parameters: + - name: site_name + value: "hanu-deploy-apps" + - name: app_name + value: "service-mesh" + templates: + - name: deploy + dag: + tasks: + - name: operator + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "istio-operator", "namespace": "istio-operator" }, + { "path": "jaeger-operator", "namespace": "lma" } + ] + dependencies: [] + - name: resource + templateRef: + name: create-application + template: AppGroup + arguments: + parameters: + - name: list + value: | + [ + { "path": "kiali-operator", "namespace": "istio-system" }, + { "path": "service-mesh-controlplane", "namespace": "istio-system" }, + { "path": "service-mesh-gateway", "namespace": "istio-system" } + ] + dependencies: [operator] From 2388dd3b139ddc8ba3409734926bbb86fc7eb0c6 Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Fri, 23 Apr 2021 11:20:58 +0900 Subject: [PATCH 4/8] rename prepare-argocd wftpl --- .../argo-cd/{prepare-argocd.yaml => prepare-argocd-wftpl.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename templates/argo-cd/{prepare-argocd.yaml => prepare-argocd-wftpl.yaml} (100%) diff --git a/templates/argo-cd/prepare-argocd.yaml b/templates/argo-cd/prepare-argocd-wftpl.yaml similarity index 100% rename from templates/argo-cd/prepare-argocd.yaml rename to templates/argo-cd/prepare-argocd-wftpl.yaml From f34d24ee1ac1771d2705cd4159dbb2491a9bbbed Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Fri, 23 Apr 2021 11:33:01 +0900 Subject: [PATCH 5/8] remove unused parameter --- templates/argo-cd/prepare-argocd-wftpl.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/argo-cd/prepare-argocd-wftpl.yaml b/templates/argo-cd/prepare-argocd-wftpl.yaml index 5dd2488..a1407eb 100644 --- a/templates/argo-cd/prepare-argocd-wftpl.yaml +++ b/templates/argo-cd/prepare-argocd-wftpl.yaml @@ -14,8 +14,6 @@ spec: value: "admin" - name: argo_password value: "password" - - name: target_server - value: "https://kubernetes.default.svc" templates: - name: configuration activeDeadlineSeconds: 120 @@ -46,6 +44,4 @@ spec: - name: ARGO_PASSWORD value: "{{workflow.parameters.argo_password}}" - name: REPO - value: "{{workflow.parameters.repository_url}}" - - name: TARGET_SERVER - value: "{{workflow.parameters.target_server}}" \ No newline at end of file + value: "{{workflow.parameters.repository_url}}" \ No newline at end of file From 1c2e863160d18e32eef7b102c14762153c2f7250 Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Fri, 23 Apr 2021 12:09:05 +0900 Subject: [PATCH 6/8] fix namespace for istio-system --- workflows/v2/service-mesh-wf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/v2/service-mesh-wf.yaml b/workflows/v2/service-mesh-wf.yaml index 79fbc0c..0acdf9f 100644 --- a/workflows/v2/service-mesh-wf.yaml +++ b/workflows/v2/service-mesh-wf.yaml @@ -24,7 +24,7 @@ spec: - name: list value: | [ - { "path": "istio-operator", "namespace": "istio-operator" }, + { "path": "istio-operator", "namespace": "istio-system" }, { "path": "jaeger-operator", "namespace": "lma" } ] dependencies: [] From f282e2aadabd02480a19598fc1937932cb7fbbc4 Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Mon, 26 Apr 2021 14:11:50 +0900 Subject: [PATCH 7/8] fix default site_name --- workflows/v2/lma-federation-wf.yaml | 10 +++++----- workflows/v2/lma-wf.yaml | 2 +- workflows/v2/openstack-components-wf.yaml | 2 +- workflows/v2/openstack-infra-wf.yaml | 2 +- workflows/v2/service-mesh-wf.yaml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/workflows/v2/lma-federation-wf.yaml b/workflows/v2/lma-federation-wf.yaml index b86cabf..fbc1942 100644 --- a/workflows/v2/lma-federation-wf.yaml +++ b/workflows/v2/lma-federation-wf.yaml @@ -8,7 +8,7 @@ spec: arguments: parameters: - name: site_name - value: "hanu-deploy-apps" + value: "hanu-reference" - name: app_name value: "lma" templates: @@ -78,10 +78,10 @@ spec: - name: federation templateRef: name: create-application - template: ChartGroup + template: AppGroup arguments: parameters: - - name: chart_list + - name: list value: | [ { "path": "prometheus-fed-master", "namespace": "fed" }, @@ -93,10 +93,10 @@ spec: - name: grafana templateRef: name: create-application - template: ChartGroup + template: AppGroup arguments: parameters: - - name: chart_list + - name: list value: | [ { "path": "grafana", "namespace": "fed" } diff --git a/workflows/v2/lma-wf.yaml b/workflows/v2/lma-wf.yaml index f5c1a4e..b99ae96 100644 --- a/workflows/v2/lma-wf.yaml +++ b/workflows/v2/lma-wf.yaml @@ -8,7 +8,7 @@ spec: arguments: parameters: - name: site_name - value: "hanu-deploy-apps" + value: "hanu-reference" - name: app_name value: "lma" templates: diff --git a/workflows/v2/openstack-components-wf.yaml b/workflows/v2/openstack-components-wf.yaml index adab687..c41e929 100644 --- a/workflows/v2/openstack-components-wf.yaml +++ b/workflows/v2/openstack-components-wf.yaml @@ -8,7 +8,7 @@ spec: arguments: parameters: - name: site_name - value: "hanu-deploy-apps" + value: "hanu-reference" - name: app_name value: "openstack" templates: diff --git a/workflows/v2/openstack-infra-wf.yaml b/workflows/v2/openstack-infra-wf.yaml index 0c8cfe9..06654bc 100644 --- a/workflows/v2/openstack-infra-wf.yaml +++ b/workflows/v2/openstack-infra-wf.yaml @@ -8,7 +8,7 @@ spec: arguments: parameters: - name: site_name - value: "hanu-deploy-apps" + value: "hanu-reference" - name: app_name value: "openstack" templates: diff --git a/workflows/v2/service-mesh-wf.yaml b/workflows/v2/service-mesh-wf.yaml index 0acdf9f..2e4e82d 100644 --- a/workflows/v2/service-mesh-wf.yaml +++ b/workflows/v2/service-mesh-wf.yaml @@ -8,7 +8,7 @@ spec: arguments: parameters: - name: site_name - value: "hanu-deploy-apps" + value: "hanu-reference" - name: app_name value: "service-mesh" templates: From 1a653851f7801efaaa9af417d773236c42be1aa9 Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Thu, 29 Apr 2021 08:50:24 +0900 Subject: [PATCH 8/8] fix namespace to elastic-system --- workflows/v2/lma-federation-wf.yaml | 4 ++-- workflows/v2/lma-wf.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflows/v2/lma-federation-wf.yaml b/workflows/v2/lma-federation-wf.yaml index fbc1942..6e1de77 100644 --- a/workflows/v2/lma-federation-wf.yaml +++ b/workflows/v2/lma-federation-wf.yaml @@ -25,7 +25,7 @@ spec: value: | [ { "path": "prometheus-operator", "namespace": "lma" }, - { "path": "eck-operator", "namespace": "lma" }, + { "path": "eck-operator", "namespace": "elastic-system" }, { "path": "fluentbit-operator", "namespace": "lma" } ] dependencies: [] @@ -101,4 +101,4 @@ spec: [ { "path": "grafana", "namespace": "fed" } ] - dependencies: [federation] \ No newline at end of file + dependencies: [federation] diff --git a/workflows/v2/lma-wf.yaml b/workflows/v2/lma-wf.yaml index b99ae96..554932e 100644 --- a/workflows/v2/lma-wf.yaml +++ b/workflows/v2/lma-wf.yaml @@ -25,7 +25,7 @@ spec: value: | [ { "path": "prometheus-operator", "namespace": "lma" }, - { "path": "eck-operator", "namespace": "lma" }, + { "path": "eck-operator", "namespace": "elastic-system" }, { "path": "fluentbit-operator", "namespace": "lma" } ] dependencies: []