From df7c5929e161293fc954c95825e3340acecde1ba Mon Sep 17 00:00:00 2001 From: Liang Xia Date: Wed, 4 Mar 2026 16:52:56 +0800 Subject: [PATCH] Unify upgrader-sa config --- .../build-clusters/build03/upgrader-sa.yaml | 41 ------------------- .../build-clusters/build04/upgrader-sa.yaml | 41 ------------------- .../build-clusters/build05/upgrader-sa.yaml | 41 ------------------- .../build-clusters/build06/upgrader-sa.yaml | 41 ------------------- .../build-clusters/build07/upgrader-sa.yaml | 41 ------------------- .../build-clusters/build08/upgrader-sa.yaml | 41 ------------------- .../build-clusters/build09/upgrader-sa.yaml | 41 ------------------- .../build-clusters/build10/upgrader-sa.yaml | 41 ------------------- .../build-clusters/build11/upgrader-sa.yaml | 41 ------------------- .../upgrader-sa.yaml | 0 10 files changed, 369 deletions(-) delete mode 100644 clusters/build-clusters/build03/upgrader-sa.yaml delete mode 100644 clusters/build-clusters/build04/upgrader-sa.yaml delete mode 100644 clusters/build-clusters/build05/upgrader-sa.yaml delete mode 100644 clusters/build-clusters/build06/upgrader-sa.yaml delete mode 100644 clusters/build-clusters/build07/upgrader-sa.yaml delete mode 100644 clusters/build-clusters/build08/upgrader-sa.yaml delete mode 100644 clusters/build-clusters/build09/upgrader-sa.yaml delete mode 100644 clusters/build-clusters/build10/upgrader-sa.yaml delete mode 100644 clusters/build-clusters/build11/upgrader-sa.yaml rename clusters/build-clusters/{build02 => common_except_app.ci}/upgrader-sa.yaml (100%) diff --git a/clusters/build-clusters/build03/upgrader-sa.yaml b/clusters/build-clusters/build03/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build03/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build04/upgrader-sa.yaml b/clusters/build-clusters/build04/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build04/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build05/upgrader-sa.yaml b/clusters/build-clusters/build05/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build05/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build06/upgrader-sa.yaml b/clusters/build-clusters/build06/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build06/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build07/upgrader-sa.yaml b/clusters/build-clusters/build07/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build07/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build08/upgrader-sa.yaml b/clusters/build-clusters/build08/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build08/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build09/upgrader-sa.yaml b/clusters/build-clusters/build09/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build09/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build10/upgrader-sa.yaml b/clusters/build-clusters/build10/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build10/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build11/upgrader-sa.yaml b/clusters/build-clusters/build11/upgrader-sa.yaml deleted file mode 100644 index 55eb066b2845f..0000000000000 --- a/clusters/build-clusters/build11/upgrader-sa.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - annotations: - openshift.io/description: This SA is used to run automatic upgrades - name: upgrader - namespace: ci ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: upgrader -rules: -- apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - update - - patch - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: upgrader -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: upgrader -subjects: -- kind: ServiceAccount - name: upgrader - namespace: ci diff --git a/clusters/build-clusters/build02/upgrader-sa.yaml b/clusters/build-clusters/common_except_app.ci/upgrader-sa.yaml similarity index 100% rename from clusters/build-clusters/build02/upgrader-sa.yaml rename to clusters/build-clusters/common_except_app.ci/upgrader-sa.yaml