From aaaa24a56222601e42c225ff3a976180ebf176e0 Mon Sep 17 00:00:00 2001
From: dutp <leave24534@gmail.com>
Date: Mon, 6 Jul 2020 18:11:02 +0800
Subject: [PATCH] change devel

(cherry picked from commit cc86204b0255c0b8abdb9853093cd2889acc13a0)
---
 config/500-webhooks.yaml | 8 ++++----
 config/controller.yaml   | 6 +++---
 config/webhook.yaml      | 8 ++++----
 tekton/publish.yaml      | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/500-webhooks.yaml b/config/500-webhooks.yaml
index 517b10a1fe8..02538b2c815 100644
--- a/config/500-webhooks.yaml
+++ b/config/500-webhooks.yaml
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: tekton-pipelines
-    pipeline.tekton.dev/release: devel
+    pipeline.tekton.dev/release: "devel"
 # The data is populated at install time.
 
 ---
@@ -33,7 +33,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: tekton-pipelines
-    pipeline.tekton.dev/release: devel
+    pipeline.tekton.dev/release: "devel"
 webhooks:
 - admissionReviewVersions:
   - v1beta1
@@ -54,7 +54,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: tekton-pipelines
-    pipeline.tekton.dev/release: devel
+    pipeline.tekton.dev/release: "devel"
 webhooks:
 - admissionReviewVersions:
   - v1beta1
@@ -75,7 +75,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: tekton-pipelines
-    pipeline.tekton.dev/release: devel
+    pipeline.tekton.dev/release: "devel"
 webhooks:
 - admissionReviewVersions:
   - v1beta1
diff --git a/config/controller.yaml b/config/controller.yaml
index 0ea463145ac..88da31e99b1 100644
--- a/config/controller.yaml
+++ b/config/controller.yaml
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/name: controller
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: devel
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/part-of: tekton-pipelines
     # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
     pipeline.tekton.dev/release: "devel"
@@ -43,7 +43,7 @@ spec:
         app.kubernetes.io/name: controller
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: default
-        app.kubernetes.io/version: devel
+        app.kubernetes.io/version: "devel"
         app.kubernetes.io/part-of: tekton-pipelines
         # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
         pipeline.tekton.dev/release: "devel"
@@ -117,7 +117,7 @@ metadata:
     app.kubernetes.io/name: controller
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: devel
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/part-of: tekton-pipelines
     # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
     pipeline.tekton.dev/release: "devel"
diff --git a/config/webhook.yaml b/config/webhook.yaml
index 0acd52bef59..9ef9cfbf5ef 100644
--- a/config/webhook.yaml
+++ b/config/webhook.yaml
@@ -24,7 +24,7 @@ metadata:
     app.kubernetes.io/name: webhook
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: devel
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/part-of: tekton-pipelines
     # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
     pipeline.tekton.dev/release: "devel"
@@ -46,7 +46,7 @@ spec:
         app.kubernetes.io/name: webhook
         app.kubernetes.io/component: webhook
         app.kubernetes.io/instance: default
-        app.kubernetes.io/version: devel
+        app.kubernetes.io/version: "devel"
         app.kubernetes.io/part-of: tekton-pipelines
         # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
         pipeline.tekton.dev/release: "devel"
@@ -97,10 +97,10 @@ metadata:
     app.kubernetes.io/name: webhook
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: devel
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/part-of: tekton-pipelines
     # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
-    pipeline.tekton.dev/release: devel
+    pipeline.tekton.dev/release: "devel"
     # labels below are related to istio and should not be used for resource lookup
     app: tekton-pipelines-webhook
     version: "devel"
diff --git a/tekton/publish.yaml b/tekton/publish.yaml
index d0d78e69ac5..8af5c9e5589 100644
--- a/tekton/publish.yaml
+++ b/tekton/publish.yaml
@@ -143,7 +143,7 @@ spec:
       done
 
       # Rewrite "devel" to inputs.params.versionTag
-      sed -i -e 's/\(pipeline.tekton.dev\/release\): "devel"/\1: "$(inputs.params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): devel/\1: $(inputs.params.versionTag)/g' -e 's/\(version\): "devel"/\1: "$(inputs.params.versionTag)"/g' /workspace/go/src/github.com/tektoncd/pipeline/config/*.yaml
+      sed -i -e 's/\(pipeline.tekton.dev\/release\): "devel"/\1: "$(inputs.params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(inputs.params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(inputs.params.versionTag)"/g' /workspace/go/src/github.com/tektoncd/pipeline/config/*.yaml
 
       OUTPUT_BUCKET_RELEASE_DIR="/workspace/output/bucket/previous/$(inputs.params.versionTag)"