PingCAP-QE · ti-chi-bot · Nov 17, 2023 · Nov 13, 2023
diff --git a/apps/dev/kustomization.yaml b/apps/dev/kustomization.yaml
diff --git a/apps/dev/prow-crd.yaml b/apps/dev/prow-crd.yaml
diff --git a/apps/dev/gateways.yaml → apps/gcp/gateways-dev.yaml b/apps/dev/gateways.yaml → apps/gcp/gateways-dev.yaml
@@ -2,14 +2,14 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: gateways
-  namespace: apps
+  namespace: apps-dev
 spec:
   interval: 5m0s
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
-  path: ./apps/dev/gateways
+  path: ./apps/gcp/gateways-dev
   prune: true
   wait: true
   postBuild:

diff --git a/apps/dev/gateways/gke-gateway.yaml → apps/gcp/gateways-dev/gke-gateway.yaml b/apps/dev/gateways/gke-gateway.yaml → apps/gcp/gateways-dev/gke-gateway.yaml
@@ -12,7 +12,7 @@ spec:
       mode: Terminate
       certificateRefs:
         - name: prow-tls
-          namespace: apps
+          namespace: apps-dev
   addresses:
   - type: NamedAddress
     value: ${INGRESS_STATIC_IP_NAME}
diff --git a/apps/dev/gateways/kustomization.yaml → apps/gcp/gateways-dev/kustomization.yaml b/apps/dev/gateways/kustomization.yaml → apps/gcp/gateways-dev/kustomization.yaml
@@ -1,5 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: apps
+namespace: apps-dev
 resources:
   - gke-gateway.yaml
diff --git a/apps/gcp/kustomization.yaml b/apps/gcp/kustomization.yaml
@@ -3,5 +3,9 @@ kind: Kustomization
 resources:
   - ../_base
   - namespace.yaml
+  - namespace-dev.yaml
   - prow-crd.yaml
   - prow
+  - gateways-dev.yaml
+  - prow-dev
+  - tekton-dev
diff --git a/apps/dev/namespace.yaml → apps/gcp/namespace-dev.yaml b/apps/dev/namespace.yaml → apps/gcp/namespace-dev.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: apps
+  name: apps-dev
diff --git a/apps/dev/OWNERS → apps/gcp/prow-dev/OWNERS b/apps/dev/OWNERS → apps/gcp/prow-dev/OWNERS
diff --git a/apps/dev/prow/kustomization.yaml → apps/gcp/prow-dev/kustomization.yaml b/apps/dev/prow/kustomization.yaml → apps/gcp/prow-dev/kustomization.yaml
diff --git a/apps/dev/prow/post.yaml → apps/gcp/prow-dev/post.yaml b/apps/dev/prow/post.yaml → apps/gcp/prow-dev/post.yaml
@@ -2,16 +2,16 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: prow-post
+  name: prow-dev-post
   namespace: flux-system
 spec:
   dependsOn:
-    - name: prow-release
+    - name: prow-dev-release
       namespace: flux-system
   interval: 5m0s
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
-  path: ./apps/dev/prow/post
+  path: ./apps/gcp/prow-dev/post
   prune: true
diff --git a/apps/dev/prow/post/kustomization.yaml → apps/gcp/prow-dev/post/kustomization.yaml b/apps/dev/prow/post/kustomization.yaml → apps/gcp/prow-dev/post/kustomization.yaml
diff --git a/apps/dev/prow/post/label-sync-cronjob.yaml → ...gcp/prow-dev/post/label-sync-cronjob.yaml b/apps/dev/prow/post/label-sync-cronjob.yaml → ...gcp/prow-dev/post/label-sync-cronjob.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  namespace: apps
+  namespace: apps-dev
   name: prow-label-sync
 spec:
   schedule: "@hourly"

diff --git a/apps/dev/prow/pre.yaml → apps/gcp/prow-dev/pre.yaml b/apps/dev/prow/pre.yaml → apps/gcp/prow-dev/pre.yaml
@@ -2,19 +2,19 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: prow-pre
+  name: prow-dev-pre
   namespace: flux-system
 spec:
   interval: 5m0s
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
-  path: ./apps/dev/prow/pre
+  path: ./apps/gcp/prow-dev/pre
   prune: true
   postBuild:
     substitute:
-      TEST_PODS_NAMESPACE: prow-test-pods
+      TEST_PODS_NAMESPACE: prow-dev-test-pods
       BUCKET_NAME: prow-dev-tidb-logs
       DOMAIN_NAME: prow-dev.tidb.net
     substituteFrom:

diff --git a/apps/dev/prow/pre/configs/README.md → apps/gcp/prow-dev/pre/configs/README.md b/apps/dev/prow/pre/configs/README.md → apps/gcp/prow-dev/pre/configs/README.md
diff --git a/apps/dev/prow/pre/configs/config.yaml → apps/gcp/prow-dev/pre/configs/config.yaml b/apps/dev/prow/pre/configs/config.yaml → apps/gcp/prow-dev/pre/configs/config.yaml
diff --git a/.../pre/configs/external_plugins_config.yaml → .../pre/configs/external_plugins_config.yaml b/.../pre/configs/external_plugins_config.yaml → .../pre/configs/external_plugins_config.yaml
diff --git a/apps/dev/prow/pre/configs/kustomization.yaml → ...p/prow-dev/pre/configs/kustomization.yaml b/apps/dev/prow/pre/configs/kustomization.yaml → ...p/prow-dev/pre/configs/kustomization.yaml
@@ -2,30 +2,30 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
   - name: prow-config
-    namespace: apps
+    namespace: apps-dev
     options:
       disableNameSuffixHash: true
     files:
       - config.yaml
   - name: prow-plugin
-    namespace: apps
+    namespace: apps-dev
     options:
       disableNameSuffixHash: true
     files:
       - plugins.yaml
   - name: prow-labels
-    namespace: apps
+    namespace: apps-dev
     options:
       disableNameSuffixHash: true
     files:
       - labels.yaml
   - name: prow-job
-    namespace: apps
+    namespace: apps-dev
     options:
       disableNameSuffixHash: true
     files: []
   - name: prow-external-plugins-config
-    namespace: apps
+    namespace: apps-dev
     options:
       disableNameSuffixHash: true
     files:

diff --git a/apps/dev/prow/pre/configs/labels.yaml → apps/gcp/prow-dev/pre/configs/labels.yaml b/apps/dev/prow/pre/configs/labels.yaml → apps/gcp/prow-dev/pre/configs/labels.yaml
diff --git a/apps/dev/prow/pre/configs/plugins.yaml → apps/gcp/prow-dev/pre/configs/plugins.yaml b/apps/dev/prow/pre/configs/plugins.yaml → apps/gcp/prow-dev/pre/configs/plugins.yaml
diff --git a/apps/dev/prow/pre/kustomization.yaml → apps/gcp/prow-dev/pre/kustomization.yaml b/apps/dev/prow/pre/kustomization.yaml → apps/gcp/prow-dev/pre/kustomization.yaml
diff --git a/apps/dev/prow/pre/namespace-test-pods.yaml → ...gcp/prow-dev/pre/namespace-test-pods.yaml b/apps/dev/prow/pre/namespace-test-pods.yaml → ...gcp/prow-dev/pre/namespace-test-pods.yaml
diff --git a/...prow/pre/rbac-test-pods-k8s-pod-full.yaml → ...-dev/pre/rbac-test-pods-k8s-pod-full.yaml b/...prow/pre/rbac-test-pods-k8s-pod-full.yaml → ...-dev/pre/rbac-test-pods-k8s-pod-full.yaml
diff --git a/apps/dev/prow/pre/secrets-test-pods.yaml → apps/gcp/prow-dev/pre/secrets-test-pods.yaml b/apps/dev/prow/pre/secrets-test-pods.yaml → apps/gcp/prow-dev/pre/secrets-test-pods.yaml
diff --git a/apps/dev/prow/pre/secrets.yaml → apps/gcp/prow-dev/pre/secrets.yaml b/apps/dev/prow/pre/secrets.yaml → apps/gcp/prow-dev/pre/secrets.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: prow-github
-  namespace: apps
+  namespace: apps-dev
 type: Opaque
 data:
   # FluxCD GitOps can not substitute multiple with lines, so we use base64.
@@ -20,7 +20,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: prow-webhook
-  namespace: apps
+  namespace: apps-dev
 type: Opaque
 stringData:
   hmac: "${GITHUB_APP_WEBHOOK_HMAC}"
@@ -29,7 +29,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: prow-oauth-cookie
-  namespace: apps
+  namespace: apps-dev
 type: Opaque
 stringData:
   secret: "${OAUTH_COOKIE_SECRET}"
@@ -38,7 +38,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: prow-gcs-credentials
-  namespace: apps
+  namespace: apps-dev
 type: Opaque
 data:
   # FluxCD GitOps can not substitute multiple with lines, so we use base64.

diff --git a/apps/dev/prow/release.yaml → apps/gcp/prow-dev/release.yaml b/apps/dev/prow/release.yaml → apps/gcp/prow-dev/release.yaml
@@ -1,24 +1,24 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: prow-release
+  name: prow-dev-release
   namespace: flux-system
 spec:
   dependsOn:
-    - name: prow-pre
+    - name: prow-dev-pre
       namespace: flux-system
   interval: 5m0s
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
-  path: ./apps/dev/prow/release
+  path: ./apps/gcp/prow-dev/release
   prune: true
   wait: true
   postBuild:
     substitute:
       BUCKET_NAME: prow-dev-tidb-logs
-      TEST_PODS_NAMESPACE: prow-test-pods
+      TEST_PODS_NAMESPACE: prow-dev-test-pods
       DOMAIN_NAME: prow-dev.tidb.net
 
       ### need secret `prow-jenkins-operator-auth` with keys:

diff --git a/apps/dev/prow/release/http-routes.yaml → apps/gcp/prow-dev/release/http-routes.yaml b/apps/dev/prow/release/http-routes.yaml → apps/gcp/prow-dev/release/http-routes.yaml
@@ -2,12 +2,12 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: prow
-  namespace: apps
+  namespace: apps-dev
 spec:
   parentRefs:
     - kind: Gateway
       name: external-https
-      namespace: apps
+      namespace: apps-dev
   hostnames:
     - "${DOMAIN_NAME}"
   rules:

diff --git a/apps/dev/prow/release/kustomization.yaml → apps/gcp/prow-dev/release/kustomization.yaml b/apps/dev/prow/release/kustomization.yaml → apps/gcp/prow-dev/release/kustomization.yaml
diff --git a/apps/dev/prow/release/release.yaml → apps/gcp/prow-dev/release/release.yaml b/apps/dev/prow/release/release.yaml → apps/gcp/prow-dev/release/release.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: flux-system
 spec:
   releaseName: prow
-  targetNamespace: apps
+  targetNamespace: apps-dev
   chart:
     spec:
       chart: prow

diff --git a/apps/dev/tekton/configs.yaml → apps/gcp/tekton-dev/configs.yaml b/apps/dev/tekton/configs.yaml → apps/gcp/tekton-dev/configs.yaml
@@ -3,15 +3,15 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: tekton-configs
-  namespace: apps
+  namespace: apps-dev
 spec:
   interval: 1m0s
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
-  path: ./apps/dev/tekton/configs
+  path: ./apps/gcp/tekton-dev/configs
   dependsOn:
     - name: tekton-setup
-      namespace: apps
+      namespace: apps-dev
   prune: true
diff --git a/apps/dev/tekton/configs/kustomization.yaml → ...gcp/tekton-dev/configs/kustomization.yaml b/apps/dev/tekton/configs/kustomization.yaml → ...gcp/tekton-dev/configs/kustomization.yaml
diff --git a/apps/dev/tekton/configs/namespace.yaml → apps/gcp/tekton-dev/configs/namespace.yaml b/apps/dev/tekton/configs/namespace.yaml → apps/gcp/tekton-dev/configs/namespace.yaml
diff --git a/...ekton/configs/pipelines/kaniko-build.yaml → ...n-dev/configs/pipelines/kaniko-build.yaml b/...ekton/configs/pipelines/kaniko-build.yaml → ...n-dev/configs/pipelines/kaniko-build.yaml
diff --git a/...onfigs/pipelines/ko-build-test-infra.yaml → ...onfigs/pipelines/ko-build-test-infra.yaml b/...onfigs/pipelines/ko-build-test-infra.yaml → ...onfigs/pipelines/ko-build-test-infra.yaml
diff --git a/...kton/configs/pipelines/kustomization.yaml → ...-dev/configs/pipelines/kustomization.yaml b/...kton/configs/pipelines/kustomization.yaml → ...-dev/configs/pipelines/kustomization.yaml
diff --git a/...v/tekton/configs/pipelines/pipeline1.yaml → ...kton-dev/configs/pipelines/pipeline1.yaml b/...v/tekton/configs/pipelines/pipeline1.yaml → ...kton-dev/configs/pipelines/pipeline1.yaml
diff --git a/apps/dev/tekton/configs/tasks/echo.yaml → apps/gcp/tekton-dev/configs/tasks/echo.yaml b/apps/dev/tekton/configs/tasks/echo.yaml → apps/gcp/tekton-dev/configs/tasks/echo.yaml
diff --git a/apps/dev/tekton/configs/tasks/git-clone.yaml → ...p/tekton-dev/configs/tasks/git-clone.yaml b/apps/dev/tekton/configs/tasks/git-clone.yaml → ...p/tekton-dev/configs/tasks/git-clone.yaml
diff --git a/...kton/configs/tasks/github-set-status.yaml → ...-dev/configs/tasks/github-set-status.yaml b/...kton/configs/tasks/github-set-status.yaml → ...-dev/configs/tasks/github-set-status.yaml
diff --git a/...ev/tekton/configs/tasks/golang-build.yaml → ...ekton-dev/configs/tasks/golang-build.yaml b/...ev/tekton/configs/tasks/golang-build.yaml → ...ekton-dev/configs/tasks/golang-build.yaml
diff --git a/...dev/tekton/configs/tasks/golang-test.yaml → ...tekton-dev/configs/tasks/golang-test.yaml b/...dev/tekton/configs/tasks/golang-test.yaml → ...tekton-dev/configs/tasks/golang-test.yaml
diff --git a/...v/tekton/configs/tasks/ko-test-infra.yaml → ...kton-dev/configs/tasks/ko-test-infra.yaml b/...v/tekton/configs/tasks/ko-test-infra.yaml → ...kton-dev/configs/tasks/ko-test-infra.yaml
diff --git a/...ton/configs/tasks/kubernetes-actions.yaml → ...dev/configs/tasks/kubernetes-actions.yaml b/...ton/configs/tasks/kubernetes-actions.yaml → ...dev/configs/tasks/kubernetes-actions.yaml
diff --git a/...v/tekton/configs/tasks/kustomization.yaml → ...kton-dev/configs/tasks/kustomization.yaml b/...v/tekton/configs/tasks/kustomization.yaml → ...kton-dev/configs/tasks/kustomization.yaml
diff --git a/.../configs/tasks/multi-arch-image-push.yaml → .../configs/tasks/multi-arch-image-push.yaml b/.../configs/tasks/multi-arch-image-push.yaml → .../configs/tasks/multi-arch-image-push.yaml
diff --git a/.../configs/triggers/bindings/github-pr.yaml → .../configs/triggers/bindings/github-pr.yaml b/.../configs/triggers/bindings/github-pr.yaml → .../configs/triggers/bindings/github-pr.yaml
diff --git a/...figs/triggers/bindings/kustomization.yaml → ...figs/triggers/bindings/kustomization.yaml b/...figs/triggers/bindings/kustomization.yaml → ...figs/triggers/bindings/kustomization.yaml
diff --git a/...kton/configs/triggers/event-listener.yaml → ...-dev/configs/triggers/event-listener.yaml b/...kton/configs/triggers/event-listener.yaml → ...-dev/configs/triggers/event-listener.yaml
diff --git a/...ekton/configs/triggers/kustomization.yaml → ...n-dev/configs/triggers/kustomization.yaml b/...ekton/configs/triggers/kustomization.yaml → ...n-dev/configs/triggers/kustomization.yaml
diff --git a/apps/dev/tekton/configs/triggers/rbac.yaml → ...gcp/tekton-dev/configs/triggers/rbac.yaml b/apps/dev/tekton/configs/triggers/rbac.yaml → ...gcp/tekton-dev/configs/triggers/rbac.yaml
diff --git a/...igs/triggers/templates/kustomization.yaml → ...igs/triggers/templates/kustomization.yaml b/...igs/triggers/templates/kustomization.yaml → ...igs/triggers/templates/kustomization.yaml
diff --git a/...on/configs/triggers/templates/public.yaml → ...ev/configs/triggers/templates/public.yaml b/...on/configs/triggers/templates/public.yaml → ...ev/configs/triggers/templates/public.yaml
diff --git a/...rs/templates/self-repo/kustomization.yaml → ...rs/templates/self-repo/kustomization.yaml b/...rs/templates/self-repo/kustomization.yaml → ...rs/templates/self-repo/kustomization.yaml
diff --git a/...gs/triggers/templates/self-repo/rbac.yaml → ...gs/triggers/templates/self-repo/rbac.yaml b/...gs/triggers/templates/self-repo/rbac.yaml → ...gs/triggers/templates/self-repo/rbac.yaml
diff --git a/...riggers/templates/self-repo/setup-pr.yaml → ...riggers/templates/self-repo/setup-pr.yaml b/...riggers/templates/self-repo/setup-pr.yaml → ...riggers/templates/self-repo/setup-pr.yaml
diff --git a/...gers/templates/self-repo/teardown-pr.yaml → ...gers/templates/self-repo/teardown-pr.yaml b/...gers/templates/self-repo/teardown-pr.yaml → ...gers/templates/self-repo/teardown-pr.yaml
diff --git a/...figs/triggers/triggers/kustomization.yaml → ...figs/triggers/triggers/kustomization.yaml b/...figs/triggers/triggers/kustomization.yaml → ...figs/triggers/triggers/kustomization.yaml
diff --git a/...ton/configs/triggers/triggers/public.yaml → ...dev/configs/triggers/triggers/public.yaml b/...ton/configs/triggers/triggers/public.yaml → ...dev/configs/triggers/triggers/public.yaml
diff --git a/...ers/triggers/self-repo/kustomization.yaml → ...ers/triggers/self-repo/kustomization.yaml b/...ers/triggers/self-repo/kustomization.yaml → ...ers/triggers/self-repo/kustomization.yaml
diff --git a/...triggers/triggers/self-repo/setup-pr.yaml → ...triggers/triggers/self-repo/setup-pr.yaml b/...triggers/triggers/self-repo/setup-pr.yaml → ...triggers/triggers/self-repo/setup-pr.yaml
diff --git a/...ggers/triggers/self-repo/teardown-pr.yaml → ...ggers/triggers/self-repo/teardown-pr.yaml b/...ggers/triggers/self-repo/teardown-pr.yaml → ...ggers/triggers/self-repo/teardown-pr.yaml
diff --git a/apps/dev/tekton/ingress.yaml → apps/gcp/tekton-dev/ingress.yaml b/apps/dev/tekton/ingress.yaml → apps/gcp/tekton-dev/ingress.yaml
@@ -3,19 +3,19 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: tekton-ingress
-  namespace: apps
+  namespace: apps-dev
 spec:
   interval: 1m0s
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
-  path: ./apps/dev/tekton/ingress
+  path: ./apps/gcp/tekton-dev/ingress
   dependsOn:
     - name: tekton-setup
-      namespace: apps
+      namespace: apps-dev
     - name: tekton-configs
-      namespace: apps
+      namespace: apps-dev
   prune: true
   postBuild:
     substitute:

diff --git a/apps/dev/tekton/ingress/http-routes.yaml → apps/gcp/tekton-dev/ingress/http-routes.yaml b/apps/dev/tekton/ingress/http-routes.yaml → apps/gcp/tekton-dev/ingress/http-routes.yaml
@@ -3,12 +3,12 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: tekton
-  namespace: apps
+  namespace: apps-dev
 spec:
   parentRefs:
     - kind: Gateway
       name: external-https
-      namespace: apps
+      namespace: apps-dev
   hostnames:
     - "${DOMAIN_NAME}"
   rules:

diff --git a/apps/dev/tekton/ingress/kustomization.yaml → ...gcp/tekton-dev/ingress/kustomization.yaml b/apps/dev/tekton/ingress/kustomization.yaml → ...gcp/tekton-dev/ingress/kustomization.yaml
diff --git a/apps/dev/tekton/kustomization.yaml → apps/gcp/tekton-dev/kustomization.yaml b/apps/dev/tekton/kustomization.yaml → apps/gcp/tekton-dev/kustomization.yaml
diff --git a/apps/dev/tekton/setup.yaml → apps/gcp/tekton-dev/setup.yaml b/apps/dev/tekton/setup.yaml → apps/gcp/tekton-dev/setup.yaml
@@ -3,13 +3,13 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: tekton-setup
-  namespace: apps
+  namespace: apps-dev
 spec:
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
-  path: ./apps/dev/tekton/setup
+  path: ./apps/gcp/tekton-dev/setup
   interval: 1m0s
   prune: true
   wait: false
@@ -50,7 +50,7 @@ spec:
   postBuild:
     substituteFrom:
       - kind: Secret
-        name: tekton-ingress # should manual created in namespace `apps`
+        name: tekton-ingress # should manual created in namespace `apps-dev`
         optional: true
   images:
     - name: gcr.io/tekton-nightly/github.com/tektoncd/experimental/pipelines-in-pipelines/cmd/controller

diff --git a/apps/dev/tekton/setup/kustomization.yaml → apps/gcp/tekton-dev/setup/kustomization.yaml b/apps/dev/tekton/setup/kustomization.yaml → apps/gcp/tekton-dev/setup/kustomization.yaml
diff --git a/apps/dev/tekton/setup/namespace.yaml → apps/gcp/tekton-dev/setup/namespace.yaml b/apps/dev/tekton/setup/namespace.yaml → apps/gcp/tekton-dev/setup/namespace.yaml
diff --git a/apps/dev/tekton/setup/operator-config.yaml → ...gcp/tekton-dev/setup/operator-config.yaml b/apps/dev/tekton/setup/operator-config.yaml → ...gcp/tekton-dev/setup/operator-config.yaml
diff --git a/clusters/dev/README.md b/clusters/dev/README.md
diff --git a/clusters/dev/apps.yaml b/clusters/dev/apps.yaml