From 7c880b8da2ae5a09be85d06de0e4ddba7d593e38 Mon Sep 17 00:00:00 2001
From: wuhuizuo <wuhuizuo@126.com>
Date: Tue, 20 Dec 2022 22:23:02 +0800
Subject: [PATCH] Revert "fix(charts/prow): insert the default env (#359)"
 (#361)

This reverts commit aac685ff77a65290df8c5983963bce10ebb30eb9.
---
 apps/staging/prow/release/release.yaml        | 28 ++++++++++---------
 charts/prow/Chart.yaml                        |  2 +-
 .../prow/templates/third-plugins/service.yaml |  2 +-
 charts/prow/values.yaml                       |  4 +++
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/apps/staging/prow/release/release.yaml b/apps/staging/prow/release/release.yaml
index 8d930345f..6bf6d72bd 100644
--- a/apps/staging/prow/release/release.yaml
+++ b/apps/staging/prow/release/release.yaml
@@ -11,7 +11,7 @@ spec:
   chart:
     spec:
       chart: prow
-      version: 0.6.2
+      version: 0.6.4
       sourceRef:
         kind: HelmRepository
         name: ee-ops
@@ -87,18 +87,20 @@ spec:
           - name: external-plugins-config
             mountPath: /etc/external_plugins_config
             readOnly: true
-        persistent:
-          type: s3
-          bucketName: ${BUCKET_NAME}
-          credentials: |
-            {
-              "region": "${BUCKET_REGION:=ceph}",
-              "endpoint": "${BUCKET_HOST}:${BUCKET_PORT}",
-              "insecure": true,
-              "s3_force_path_style": true,
-              "access_key": "${AWS_ACCESS_KEY_ID}",
-              "secret_key": "${AWS_SECRET_ACCESS_KEY}"
-            }
+        service:
+          type: Cluster
+    persistent:
+      type: s3
+      bucketName: ${BUCKET_NAME}
+      credentials: |
+        {
+          "region": "${BUCKET_REGION:=ceph}",
+          "endpoint": "${BUCKET_HOST}:${BUCKET_PORT}",
+          "insecure": true,
+          "s3_force_path_style": true,
+          "access_key": "${AWS_ACCESS_KEY_ID}",
+          "secret_key": "${AWS_SECRET_ACCESS_KEY}"
+        }
   postRenderers:
     - kustomize:
         patchesJson6902:
diff --git a/charts/prow/Chart.yaml b/charts/prow/Chart.yaml
index 78f722eaf..d026066ac 100644
--- a/charts/prow/Chart.yaml
+++ b/charts/prow/Chart.yaml
@@ -21,7 +21,7 @@ type: application
 # time you make changes to the chart and its templates,
 # including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.6.2"
+version: "0.6.4"
 
 # This is the version number of the application being deployed.
 # This version number should be incremented each time you make changes to the
diff --git a/charts/prow/templates/third-plugins/service.yaml b/charts/prow/templates/third-plugins/service.yaml
index c8776b19f..112c7c89d 100644
--- a/charts/prow/templates/third-plugins/service.yaml
+++ b/charts/prow/templates/third-plugins/service.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   type: {{ default "ClusterIP" $val.service.type }}
   ports:
-    - port: {{ $val.service.port }}
+    - port: {{ default 80 $val.service.port }}
       targetPort: http
       protocol: TCP
       name: http
diff --git a/charts/prow/values.yaml b/charts/prow/values.yaml
index a6c25366c..b238d7b8e 100644
--- a/charts/prow/values.yaml
+++ b/charts/prow/values.yaml
@@ -460,6 +460,10 @@ thirdPlugins: {}
   #   ports:
   #     http: 80
   #   resources: {}
+  #   service: true   # or
+  #   service:
+  #     type: ClusterIP
+  #     port: 80
   # ti-community-autoresponder: {}
   # ti-community-blunderbuss:
   # ti-community-cherrypicker: