add repository_url parameter into application workflow

openinfradev · May 14, 2021 · 6637311 · 6637311
1 parent 625c45b
commit 6637311
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/templates/argo-cd/createapp-wftpl.yaml b/templates/argo-cd/createapp-wftpl.yaml
@@ -9,6 +9,8 @@ spec:
       value: "hanu-deploy-apps"
     - name: app_name
       value: "lma"
+    - name: repository_url
+      value: "https://github.com/openinfradev/decapod-manifests"
   templates:
   - name: createApp
     inputs:
@@ -47,6 +49,8 @@ spec:
           value: "{{workflow.parameters.app_name}}"
         - name: NAMESPACE
           value: "{{inputs.parameters.namespace}}"
+        - name: REPO
+          value: "{{workflow.parameters.repository_url}}"
 
   - name: AppGroup
     inputs:

diff --git a/templates/argo-cd/prepare-argocd-wftpl.yaml b/templates/argo-cd/prepare-argocd-wftpl.yaml
@@ -6,10 +6,8 @@ spec:
   startpoint: configuration
   arguments:
     parameters:
-    - name: repository_url
-      value: "https://github.com/openinfradev/decapod-manifests"
     - name: argo_server
-      value: "192.168.97.192:30080"
+      value: "decapod-argocd-server.argo.svc:80"
     - name: argo_username
       value: "admin"
     - name: argo_password
@@ -33,8 +31,7 @@ spec:
         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
+        --from-literal=ARGO_PASSWORD=$ARGO_PASSWORD
 
       env:
       - name: ARGO_SERVER
@@ -43,5 +40,3 @@ spec:
         value: "{{workflow.parameters.argo_username}}"
       - name: ARGO_PASSWORD
         value: "{{workflow.parameters.argo_password}}"
-      - name: REPO
-        value: "{{workflow.parameters.repository_url}}"
diff --git a/workflows/v2/lma-federation-wf.yaml b/workflows/v2/lma-federation-wf.yaml
@@ -11,6 +11,8 @@ spec:
       value: "hanu-reference"
     - name: app_name
       value: "lma"
+    - name: repository_url
+      value: "https://github.com/openinfradev/decapod-manifests"
   templates:
   - name: deploy
     dag:

diff --git a/workflows/v2/lma-wf.yaml b/workflows/v2/lma-wf.yaml
@@ -11,6 +11,8 @@ spec:
       value: "hanu-reference"
     - name: app_name
       value: "lma"
+    - name: repository_url
+      value: "https://github.com/openinfradev/decapod-manifests"
   templates:
   - name: deploy
     dag:

diff --git a/workflows/v2/openstack-components-wf.yaml b/workflows/v2/openstack-components-wf.yaml
@@ -11,6 +11,8 @@ spec:
       value: "hanu-reference"
     - name: app_name
       value: "openstack"
+    - name: repository_url
+      value: "https://github.com/openinfradev/decapod-manifests"
   templates:
   - name: deploy
     dag:

diff --git a/workflows/v2/openstack-infra-wf.yaml b/workflows/v2/openstack-infra-wf.yaml
@@ -11,6 +11,8 @@ spec:
       value: "hanu-reference"
     - name: app_name
       value: "openstack"
+    - name: repository_url
+      value: "https://github.com/openinfradev/decapod-manifests"
   templates:
   - name: deploy
     dag:

diff --git a/workflows/v2/service-mesh-wf.yaml b/workflows/v2/service-mesh-wf.yaml
@@ -11,6 +11,8 @@ spec:
       value: "hanu-reference"
     - name: app_name
       value: "service-mesh"
+    - name: repository_url
+      value: "https://github.com/openinfradev/decapod-manifests"
   templates:
   - name: deploy
     dag: