chore(deploy): add all in one yaml file to deploy operator (#6165)

Author: liubog2008

Makefile

@@ -47,7 +47,6 @@ push/%:
 .PHONY: deploy
 deploy: crd
 	$(KUBECTL) apply --server-side=true -f $(ROOT)/manifests/crd
-	$(KUBECTL) apply --server-side=true -f $(ROOT)/manifests/rbac
 	$(KUBECTL) apply --server-side=true -f $(ROOT)/manifests/deploy
 
 .PHONY: codegen
@@ -79,15 +78,15 @@ overlaygen: bin/overlay-gen
 		--go-header-file=$(BOILERPLATE_FILE) \
 		k8s.io/api/core/v1
 
+.PHONY: yamlgen
+yamlgen: crd
+	$(ROOT)/hack/yaml.sh
+
 .PHONY: crd
 crd: bin/controller-gen build/crd-modifier
 	$(CONTROLLER_GEN) crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=$(ROOT)/manifests/crd paths=$(API_PATH)/...
 	$(BIN_DIR)/crd-modifier -dir $(ROOT)/manifests/crd
 
-# Deprecate this generator, rbac generator cannot well handle nonResourceURLs
-.PHONY: rbac
-rbac: bin/controller-gen
-	$(CONTROLLER_GEN) rbac:roleName=tidb-operator output:rbac:artifacts:config=$(ROOT)/manifests/rbac paths=$(API_PATH)/...
 
 .PHONY: tidy
 tidy:
@@ -103,7 +102,7 @@ gengo: bin/mockgen
 license: bin/license-eye
 	$(LICENSE_EYE) -c .github/licenserc.yaml header fix
 
-ALL_GEN = tidy codegen crd gengo overlaygen
+ALL_GEN = tidy codegen crd gengo overlaygen yamlgen
 .PHONY: generate
 generate: $(ALL_GEN) license
 

hack/lib/e2e.sh

@@ -64,11 +64,6 @@ function e2e::install_crds() {
     $KUBECTL apply --server-side=true -f $ROOT/manifests/crd
 }
 
-function e2e::install_rbac() {
-    echo "installing RBAC..."
-    $KUBECTL -n $V_DEPLOY_NAMESPACE apply --server-side=true -f $ROOT/manifests/rbac
-}
-
 function e2e::install_operator() {
     echo "installing operator..."
     $KUBECTL -n $V_DEPLOY_NAMESPACE apply --server-side=true -f $ROOT/manifests/deploy
@@ -126,7 +121,6 @@ function e2e::prepare() {
     e2e::ensure_cert_manager
 
     e2e::install_crds
-    e2e::install_rbac
 
     # build the operator image and load it into the kind cluster
     image::build prestop-checker operator testing-workload backup-manager --push

hack/lib/vars.sh

@@ -23,6 +23,10 @@ set -o pipefail
 
 ROOT=$(cd $(dirname "${BASH_SOURCE[0]}")/../..; pwd -P)
 
+# Set LC_ALL to avoid sort issue
+# See https://www.gnu.org/software/coreutils/manual/html_node/ls-invocation.html#ls-invocation
+readonly LC_ALL=C
+
 # ---
 # Global variables definitions.
 # All variables should be in format V_XXX

hack/yaml.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Copyright 2024 PingCAP, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+ROOT=$(cd $(dirname "${BASH_SOURCE[0]}")/..; pwd -P)
+source $ROOT/hack/lib/vars.sh
+
+OPERATOR=$ROOT/manifests/tidb-operator.yaml
+CRDS=$ROOT/manifests/tidb-operator.crds.yaml
+
+echo -n > $CRDS
+echo -n > $OPERATOR
+for f in $ROOT/manifests/crd/*.yaml; do
+    echo "append $f"
+    cat $f >> $CRDS
+    cat $f >> $OPERATOR
+done
+
+for f in $ROOT/manifests/deploy/*.yaml; do
+    echo "append $f"
+    cat $f >> $OPERATOR
+done

manifests/rbac/namespace.yaml renamed to manifests/deploy/00-ns.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Namespace
 metadata:

manifests/rbac/service_account.yaml renamed to manifests/deploy/01-sa.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:

manifests/rbac/role.yaml renamed to manifests/deploy/02-role.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:

manifests/rbac/role_binding.yaml renamed to manifests/deploy/03-role_binding.yaml

@@ -1,3 +1,4 @@
+---
 # This policy is defined to avoid unexpected deletion of tikv pods.
 # We cannot change grace period after it has been set because of this issue
 # https://github.com/kubernetes/kubernetes/issues/83916.

manifests/deploy/webhook.yaml renamed to manifests/deploy/04-webhook.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata: