Add pipelines and triggers namespace flags to openshift overlays

jjjjijiji · Jun 10, 2020 · ca2e27c · ca2e27c
1 parent cb92ae0
commit ca2e27c
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 0 deletions.
diff --git a/docs/install.md b/docs/install.md
@@ -86,6 +86,10 @@ To install Tekton Dashboard on an OpenShift cluster:
 
 Congratulations! You have successfully installed Tekton Dashboard on your OpenShift cluster.
 
+**Note for users installing Tekton Pipelines and Triggers outside the OpenShift Pipelines operator:**
+
+Tekton Dashboard on OpenShift works out of the box with the OpenShift Pipelines operator. If you installed Tekton Pipelines and Triggers without using the OpenShift Pipelines operator, you will need to change the following args `--pipelines-namespace=openshift-pipelines` and `--triggers-namespace=openshift-pipelines` and set their values to the namespace where Pipelines and Triggers were respectively deployed.
+
 ## Accessing the Dashboard on Kubernetes
 
 By default, the Dashboard is not exposed outside the cluster.

diff --git a/overlays/dev-openshift-imagestream/kustomization.yaml b/overlays/dev-openshift-imagestream/kustomization.yaml
@@ -29,6 +29,13 @@ patchesJson6902:
       name: tekton-dashboard
       namespace: tekton-pipelines
     path: ../logout/deployment-patch.yaml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: tekton-dashboard
+      namespace: tekton-pipelines
+    path: ../openshift-patches/flags-deployment.yaml
 images:
   - name: dashboardImage
     newName: tekton-pipelines/tekton-dashboard

diff --git a/overlays/dev-openshift-locked-down/kustomization.yaml b/overlays/dev-openshift-locked-down/kustomization.yaml
@@ -35,6 +35,13 @@ patchesJson6902:
       name: tekton-dashboard
       namespace: tekton-pipelines
     path: ../logout/deployment-patch.yaml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: tekton-dashboard
+      namespace: tekton-pipelines
+    path: ../openshift-patches/flags-deployment.yaml
 images:
   - name: dashboardImage
     newName: github.com/tektoncd/dashboard/cmd/dashboard

diff --git a/overlays/dev-openshift/kustomization.yaml b/overlays/dev-openshift/kustomization.yaml
@@ -28,6 +28,13 @@ patchesJson6902:
       name: tekton-dashboard
       namespace: tekton-pipelines
     path: ../logout/deployment-patch.yaml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: tekton-dashboard
+      namespace: tekton-pipelines
+    path: ../openshift-patches/flags-deployment.yaml
 images:
   - name: dashboardImage
     newName: github.com/tektoncd/dashboard/cmd/dashboard

diff --git a/overlays/latest-openshift-locked-down/kustomization.yaml b/overlays/latest-openshift-locked-down/kustomization.yaml
@@ -28,6 +28,13 @@ patchesJson6902:
       name: tekton-dashboard
       namespace: tekton-pipelines
     path: ../logout/deployment-patch.yaml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: tekton-dashboard
+      namespace: tekton-pipelines
+    path: ../openshift-patches/flags-deployment.yaml
 images:
   - name: dashboardImage
     newName: gcr.io/tekton-nightly/dashboard

diff --git a/overlays/latest-openshift/kustomization.yaml b/overlays/latest-openshift/kustomization.yaml
@@ -21,6 +21,13 @@ patchesJson6902:
       name: tekton-dashboard
       namespace: tekton-pipelines
     path: ../logout/deployment-patch.yaml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: tekton-dashboard
+      namespace: tekton-pipelines
+    path: ../openshift-patches/flags-deployment.yaml
 images:
   - name: dashboardImage
     newName: gcr.io/tekton-nightly/dashboard

diff --git a/overlays/openshift-patches/flags-patch.yaml b/overlays/openshift-patches/flags-patch.yaml
@@ -0,0 +1,11 @@
+---
+# Openshift Pipelines operator will install Triggers and Pipelines
+# in the openshift-pipelines namespace
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value:
+    --pipelines-namespace=openshift-pipelines
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value:
+    --triggers-namespace=openshift-pipelines