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

This reverts commit aac685ff77a65290df8c5983963bce10ebb30eb9.
---
 apps/staging/prow/release/release.yaml              |  3 +--
 charts/prow/Chart.yaml                              |  2 +-
 charts/prow/templates/third-plugins/deployment.yaml | 11 ++---------
 infrastructure/staging/monitoring/operator.yaml     |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/apps/staging/prow/release/release.yaml b/apps/staging/prow/release/release.yaml
index 39cdc4aa4..8d930345f 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.3
+      version: 0.6.2
       sourceRef:
         kind: HelmRepository
         name: ee-ops
@@ -79,7 +79,6 @@ spec:
           - --github-app-id=$(GITHUB_APP_ID)
           - --github-app-private-key-path=/etc/github/cert
           - --github-endpoint=http://ghproxy
-          - --github-graphql-endpoint=http://ghproxy/graphql
         volumes:
           - name: external-plugins-config
             configMap:
diff --git a/charts/prow/Chart.yaml b/charts/prow/Chart.yaml
index 4ae74d5b9..78f722eaf 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.3"
+version: "0.6.2"
 
 # 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/deployment.yaml b/charts/prow/templates/third-plugins/deployment.yaml
index 5ff60bfe5..acc93709a 100644
--- a/charts/prow/templates/third-plugins/deployment.yaml
+++ b/charts/prow/templates/third-plugins/deployment.yaml
@@ -63,17 +63,10 @@ spec:
             - --github-endpoint=http://{{ include "prow.fullname.ghproxy" $root }}
             - --github-graphql-endpoint=http://{{ include "prow.fullname.ghproxy" $root }}/graphql
           {{- end }}
+          {{- if $val.env }}
           env:
-            {{- if not (contains "GITHUB_APP_ID" (quote $val.env)) }}
-            - name: GITHUB_APP_ID
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "prow.fullname" $root }}-github-token
-                  key: appid
-            {{- end }}
-            {{- if $val.env }}
             {{- toYaml $val.env | nindent 12 }}
-            {{- end }}
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ $val.ports.http | default 80 }}
diff --git a/infrastructure/staging/monitoring/operator.yaml b/infrastructure/staging/monitoring/operator.yaml
index 05cd404ee..dcd3f8961 100644
--- a/infrastructure/staging/monitoring/operator.yaml
+++ b/infrastructure/staging/monitoring/operator.yaml
@@ -4,7 +4,7 @@ metadata:
   name: prometheus-operator
   namespace: flux-system
 spec:
-  interval: 24h
+  interval: 10m0s
   path: ./manifests/setup
   prune: true
   sourceRef: