From 9bec9eab364bb86116af0184cdfd4517f7c08128 Mon Sep 17 00:00:00 2001
From: purelind <purelind@gmail.com>
Date: Wed, 2 Aug 2023 12:23:35 +0800
Subject: [PATCH 1/3] fix: add ns conf on post step

---
 apps/prod/jenkins-beta/post/cd/kustomization.yaml        | 6 ++++++
 apps/prod/jenkins-beta/post/cd/namespace.yaml            | 9 +++++++++
 apps/prod/jenkins-beta/post/kustomization.yaml           | 6 ++++++
 .../jenkins-beta/post/ti-pipeline/kustomization.yaml     | 6 ++++++
 apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml   | 9 +++++++++
 5 files changed, 36 insertions(+)
 create mode 100644 apps/prod/jenkins-beta/post/cd/kustomization.yaml
 create mode 100644 apps/prod/jenkins-beta/post/cd/namespace.yaml
 create mode 100644 apps/prod/jenkins-beta/post/kustomization.yaml
 create mode 100644 apps/prod/jenkins-beta/post/ti-pipeline/kustomization.yaml
 create mode 100644 apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml

diff --git a/apps/prod/jenkins-beta/post/cd/kustomization.yaml b/apps/prod/jenkins-beta/post/cd/kustomization.yaml
new file mode 100644
index 000000000..102c2dd91
--- /dev/null
+++ b/apps/prod/jenkins-beta/post/cd/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: jenkins-cd
+resources:
+  - namespace.yaml
+  - ../_base/rbac.yaml
diff --git a/apps/prod/jenkins-beta/post/cd/namespace.yaml b/apps/prod/jenkins-beta/post/cd/namespace.yaml
new file mode 100644
index 000000000..cf835b8dd
--- /dev/null
+++ b/apps/prod/jenkins-beta/post/cd/namespace.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: jenkins-cd
+  annotations:
+    scheduler.alpha.kubernetes.io/defaultTolerations:
+      '[{"operator": "Equal", "effect": "NoSchedule", "key": "dedicated",
+      "value": "test-infra"}]'
+    scheduler.alpha.kubernetes.io/node-selector: enable-ci=true
diff --git a/apps/prod/jenkins-beta/post/kustomization.yaml b/apps/prod/jenkins-beta/post/kustomization.yaml
new file mode 100644
index 000000000..5c1e0349e
--- /dev/null
+++ b/apps/prod/jenkins-beta/post/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ti-pipeline
+  - cd
+
diff --git a/apps/prod/jenkins-beta/post/ti-pipeline/kustomization.yaml b/apps/prod/jenkins-beta/post/ti-pipeline/kustomization.yaml
new file mode 100644
index 000000000..291ae145d
--- /dev/null
+++ b/apps/prod/jenkins-beta/post/ti-pipeline/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: jenkins-ti-pipeline
+resources:
+  - namespace.yaml
+  - ../_base/rbac.yaml
diff --git a/apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml b/apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml
new file mode 100644
index 000000000..e7659d079
--- /dev/null
+++ b/apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: jenkins-ti-pipeline
+  annotations:
+    scheduler.alpha.kubernetes.io/defaultTolerations:
+      '[{"operator": "Equal", "effect": "NoSchedule", "key": "dedicated",
+      "value": "test-infra"}]'
+    scheduler.alpha.kubernetes.io/node-selector: enable-ci=true,ci-nvme-high-performance=true

From 5af8e18425c436544a033603faf4e777434cca86 Mon Sep 17 00:00:00 2001
From: purelind <purelind@gmail.com>
Date: Wed, 2 Aug 2023 14:16:55 +0800
Subject: [PATCH 2/3] fix: remove useless post step

---
 .../post/_base/kustomization.yaml             |  5 ---
 apps/prod/jenkins-beta/post/_base/rbac.yaml   | 42 -------------------
 .../jenkins-beta/post/cd/kustomization.yaml   |  6 ---
 apps/prod/jenkins-beta/post/cd/namespace.yaml |  9 ----
 .../prod/jenkins-beta/post/kustomization.yaml |  6 ---
 .../post/ti-pipeline/kustomization.yaml       |  6 ---
 .../post/ti-pipeline/namespace.yaml           |  9 ----
 7 files changed, 83 deletions(-)
 delete mode 100644 apps/prod/jenkins-beta/post/_base/kustomization.yaml
 delete mode 100644 apps/prod/jenkins-beta/post/_base/rbac.yaml
 delete mode 100644 apps/prod/jenkins-beta/post/cd/kustomization.yaml
 delete mode 100644 apps/prod/jenkins-beta/post/cd/namespace.yaml
 delete mode 100644 apps/prod/jenkins-beta/post/kustomization.yaml
 delete mode 100644 apps/prod/jenkins-beta/post/ti-pipeline/kustomization.yaml
 delete mode 100644 apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml

diff --git a/apps/prod/jenkins-beta/post/_base/kustomization.yaml b/apps/prod/jenkins-beta/post/_base/kustomization.yaml
deleted file mode 100644
index b3b589297..000000000
--- a/apps/prod/jenkins-beta/post/_base/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - rbac.yaml
-
diff --git a/apps/prod/jenkins-beta/post/_base/rbac.yaml b/apps/prod/jenkins-beta/post/_base/rbac.yaml
deleted file mode 100644
index 08c281579..000000000
--- a/apps/prod/jenkins-beta/post/_base/rbac.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: jenkins-beta-schedule-agents
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - pods/exec
-      - pods/log
-      - persistentvolumeclaims
-      - events
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - pods/exec
-      - persistentvolumeclaims
-    verbs:
-      - create
-      - delete
-      - deletecollection
-      - patch
-      - update
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: jenkins-beta-schedule-agents
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: jenkins-beta-schedule-agents
-subjects:
-  - kind: ServiceAccount
-    name: jenkins-beta
-    namespace: apps
diff --git a/apps/prod/jenkins-beta/post/cd/kustomization.yaml b/apps/prod/jenkins-beta/post/cd/kustomization.yaml
deleted file mode 100644
index 102c2dd91..000000000
--- a/apps/prod/jenkins-beta/post/cd/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: jenkins-cd
-resources:
-  - namespace.yaml
-  - ../_base/rbac.yaml
diff --git a/apps/prod/jenkins-beta/post/cd/namespace.yaml b/apps/prod/jenkins-beta/post/cd/namespace.yaml
deleted file mode 100644
index cf835b8dd..000000000
--- a/apps/prod/jenkins-beta/post/cd/namespace.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: jenkins-cd
-  annotations:
-    scheduler.alpha.kubernetes.io/defaultTolerations:
-      '[{"operator": "Equal", "effect": "NoSchedule", "key": "dedicated",
-      "value": "test-infra"}]'
-    scheduler.alpha.kubernetes.io/node-selector: enable-ci=true
diff --git a/apps/prod/jenkins-beta/post/kustomization.yaml b/apps/prod/jenkins-beta/post/kustomization.yaml
deleted file mode 100644
index 5c1e0349e..000000000
--- a/apps/prod/jenkins-beta/post/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ti-pipeline
-  - cd
-
diff --git a/apps/prod/jenkins-beta/post/ti-pipeline/kustomization.yaml b/apps/prod/jenkins-beta/post/ti-pipeline/kustomization.yaml
deleted file mode 100644
index 291ae145d..000000000
--- a/apps/prod/jenkins-beta/post/ti-pipeline/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: jenkins-ti-pipeline
-resources:
-  - namespace.yaml
-  - ../_base/rbac.yaml
diff --git a/apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml b/apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml
deleted file mode 100644
index e7659d079..000000000
--- a/apps/prod/jenkins-beta/post/ti-pipeline/namespace.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: jenkins-ti-pipeline
-  annotations:
-    scheduler.alpha.kubernetes.io/defaultTolerations:
-      '[{"operator": "Equal", "effect": "NoSchedule", "key": "dedicated",
-      "value": "test-infra"}]'
-    scheduler.alpha.kubernetes.io/node-selector: enable-ci=true,ci-nvme-high-performance=true

From 4aeef93b95b932a54e99c397bd292767784f8615 Mon Sep 17 00:00:00 2001
From: purelind <purelind@gmail.com>
Date: Wed, 2 Aug 2023 14:28:29 +0800
Subject: [PATCH 3/3] chore: remove post

---
 apps/prod/jenkins-beta/kustomization.yaml |  2 +-
 apps/prod/jenkins-beta/post.yaml          | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 apps/prod/jenkins-beta/post.yaml

diff --git a/apps/prod/jenkins-beta/kustomization.yaml b/apps/prod/jenkins-beta/kustomization.yaml
index 8c8fd5b22..39ef7d290 100644
--- a/apps/prod/jenkins-beta/kustomization.yaml
+++ b/apps/prod/jenkins-beta/kustomization.yaml
@@ -3,4 +3,4 @@ kind: Kustomization
 resources:
   - pre.yaml
   - release.yaml
-  - post.yaml
+
diff --git a/apps/prod/jenkins-beta/post.yaml b/apps/prod/jenkins-beta/post.yaml
deleted file mode 100644
index 26b767b60..000000000
--- a/apps/prod/jenkins-beta/post.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: jenkins-beta-post
-  namespace: flux-system
-spec:
-  dependsOn:
-    - name: jenkins-beta-release
-  interval: 5m0s
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-    namespace: flux-system
-  path: ./apps/prod/jenkins-beta/post
-  prune: true
-  force: true