From 72bd77fca3330c7cf3746d113b266792ffea6854 Mon Sep 17 00:00:00 2001 From: Mingchen Dai Date: Mon, 30 Sep 2024 08:19:26 +0000 Subject: [PATCH] Fix name-too-long problem during deployment: The Service "devstar-devcontainer-kubebuilder-scaffold-controller-manager-metrics-service" is invalid: metadata.name: Invalid value: "devstar-devcontainer-kubebuilder-scaffold-controller-manager-metrics-service": must be no more than 63 characters make: *** [Makefile:140: deploy] Error 1 --- Makefile | 6 +++--- PROJECT | 2 +- README.md | 10 +++++----- config/default/kustomization.yaml | 4 ++-- config/default/metrics_service.yaml | 2 +- config/manager/manager.yaml | 4 ++-- config/network-policy/allow-metrics-traffic.yaml | 2 +- config/prometheus/monitor.yaml | 2 +- config/rbac/devcontainerapp_editor_role.yaml | 2 +- config/rbac/devcontainerapp_viewer_role.yaml | 2 +- config/rbac/leader_election_role.yaml | 2 +- config/rbac/leader_election_role_binding.yaml | 2 +- config/rbac/role_binding.yaml | 2 +- config/rbac/service_account.yaml | 2 +- config/samples/devcontainer_v1_devcontainerapp.yaml | 2 +- test/e2e/e2e_suite_test.go | 2 +- test/e2e/e2e_test.go | 4 ++-- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 755b2c6..9786039 100644 --- a/Makefile +++ b/Makefile @@ -108,10 +108,10 @@ PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le docker-buildx: ## Build and push docker image for the manager for cross-platform support # copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - - $(CONTAINER_TOOL) buildx create --name devstar-devcontainer-kubebuilder-scaffold-builder - $(CONTAINER_TOOL) buildx use devstar-devcontainer-kubebuilder-scaffold-builder + - $(CONTAINER_TOOL) buildx create --name devcontainer-operator-builder + $(CONTAINER_TOOL) buildx use devcontainer-operator-builder - $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - - $(CONTAINER_TOOL) buildx rm devstar-devcontainer-kubebuilder-scaffold-builder + - $(CONTAINER_TOOL) buildx rm devcontainer-operator-builder rm Dockerfile.cross .PHONY: build-installer diff --git a/PROJECT b/PROJECT index 6f1a80f..86af94f 100644 --- a/PROJECT +++ b/PROJECT @@ -5,7 +5,7 @@ domain: devstar.cn layout: - go.kubebuilder.io/v4 -projectName: devstar-devcontainer-kubebuilder-scaffold +projectName: devcontainer-operator repo: devstar.cn/DevcontainerApp resources: - api: diff --git a/README.md b/README.md index 80a4f4e..380b113 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# devstar-devcontainer-kubebuilder-scaffold +# devcontainer-operator DevStar DevContainer CRD 脚手架工程 @@ -43,7 +43,7 @@ kubectl get sc **Build and push your image to the location specified by `IMG`:** ```sh -make docker-build docker-push IMG=/devstar-devcontainer-kubebuilder-scaffold:tag +make docker-build docker-push IMG=/devcontainer-operator:tag ``` **NOTE:** This image ought to be published in the personal registry you specified. @@ -59,7 +59,7 @@ make install **Deploy the Manager to the cluster with the image specified by `IMG`:** ```sh -make deploy IMG=/devstar-devcontainer-kubebuilder-scaffold:tag +make deploy IMG=/devcontainer-operator:tag ``` > **NOTE**: If you encounter RBAC errors, you may need to grant yourself cluster-admin @@ -100,7 +100,7 @@ Following are the steps to build the installer and distribute this project to us 1. Build the installer for the image built and published in the registry: ```sh -make build-installer IMG=/devstar-devcontainer-kubebuilder-scaffold:tag +make build-installer IMG=/devcontainer-operator:tag ``` NOTE: The makefile target mentioned above generates an 'install.yaml' @@ -113,7 +113,7 @@ its dependencies. Users can just run kubectl apply -f to install the project, i.e.: ```sh -kubectl apply -f https://raw.githubusercontent.com//devstar-devcontainer-kubebuilder-scaffold//dist/install.yaml +kubectl apply -f https://raw.githubusercontent.com//devcontainer-operator//dist/install.yaml ``` ## Contributing diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 63354d2..ecf959c 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,12 +1,12 @@ # Adds namespace to all resources. -namespace: devstar-devcontainer-kubebuilder-scaffold-system +namespace: devcontainer-operator-system # Value of this field is prepended to the # names of all resources, e.g. a deployment named # "wordpress" becomes "alices-wordpress". # Note that it should also match with the prefix (text before '-') of the namespace # field above. -namePrefix: devstar-devcontainer-kubebuilder-scaffold- +namePrefix: devcontainer-operator- # Labels to add to all resources and selectors. #labels: diff --git a/config/default/metrics_service.yaml b/config/default/metrics_service.yaml index 5706128..1647fa3 100644 --- a/config/default/metrics_service.yaml +++ b/config/default/metrics_service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: labels: control-plane: controller-manager - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: controller-manager-metrics-service namespace: system diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 08e05c7..bab39dd 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -3,7 +3,7 @@ kind: Namespace metadata: labels: control-plane: controller-manager - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: system --- @@ -14,7 +14,7 @@ metadata: namespace: system labels: control-plane: controller-manager - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize spec: selector: diff --git a/config/network-policy/allow-metrics-traffic.yaml b/config/network-policy/allow-metrics-traffic.yaml index 1a854fe..a603a1b 100644 --- a/config/network-policy/allow-metrics-traffic.yaml +++ b/config/network-policy/allow-metrics-traffic.yaml @@ -5,7 +5,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: labels: - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: allow-metrics-traffic namespace: system diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index 4dc85c3..a11db15 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -4,7 +4,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: controller-manager-metrics-monitor namespace: system diff --git a/config/rbac/devcontainerapp_editor_role.yaml b/config/rbac/devcontainerapp_editor_role.yaml index 83562ff..271ab18 100644 --- a/config/rbac/devcontainerapp_editor_role.yaml +++ b/config/rbac/devcontainerapp_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: devcontainerapp-editor-role rules: diff --git a/config/rbac/devcontainerapp_viewer_role.yaml b/config/rbac/devcontainerapp_viewer_role.yaml index 02ee562..9048b94 100644 --- a/config/rbac/devcontainerapp_viewer_role.yaml +++ b/config/rbac/devcontainerapp_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: devcontainerapp-viewer-role rules: diff --git a/config/rbac/leader_election_role.yaml b/config/rbac/leader_election_role.yaml index 71f8a2f..7332ce7 100644 --- a/config/rbac/leader_election_role.yaml +++ b/config/rbac/leader_election_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml index 839f57f..1a84fa8 100644 --- a/config/rbac/leader_election_role_binding.yaml +++ b/config/rbac/leader_election_role_binding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: leader-election-rolebinding roleRef: diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index e65801a..67536ec 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: manager-rolebinding roleRef: diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml index 6f82115..578023d 100644 --- a/config/rbac/service_account.yaml +++ b/config/rbac/service_account.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/config/samples/devcontainer_v1_devcontainerapp.yaml b/config/samples/devcontainer_v1_devcontainerapp.yaml index c60982d..2f5616b 100644 --- a/config/samples/devcontainer_v1_devcontainerapp.yaml +++ b/config/samples/devcontainer_v1_devcontainerapp.yaml @@ -4,7 +4,7 @@ metadata: name: daimingchen-devstar-beef092a69c011ef9c00000c2952a362 namespace: devstar-studio-ns labels: - app.kubernetes.io/name: devstar-devcontainer-kubebuilder-scaffold + app.kubernetes.io/name: devcontainer-operator app.kubernetes.io/managed-by: kustomize spec: statefulset: diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 023417d..0ec178c 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -27,6 +27,6 @@ import ( // Run e2e tests using the Ginkgo runner. func TestE2E(t *testing.T) { RegisterFailHandler(Fail) - _, _ = fmt.Fprintf(GinkgoWriter, "Starting devstar-devcontainer-kubebuilder-scaffold suite\n") + _, _ = fmt.Fprintf(GinkgoWriter, "Starting devcontainer-operator suite\n") RunSpecs(t, "e2e suite") } diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 39fe7ab..7cc9722 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -27,7 +27,7 @@ import ( "devstar.cn/DevcontainerApp/test/utils" ) -const namespace = "devstar-devcontainer-kubebuilder-scaffold-system" +const namespace = "devcontainer-operator-system" var _ = Describe("controller", Ordered, func() { BeforeAll(func() { @@ -60,7 +60,7 @@ var _ = Describe("controller", Ordered, func() { var err error // projectimage stores the name of the image used in the example - var projectimage = "example.com/devstar-devcontainer-kubebuilder-scaffold:v0.0.1" + var projectimage = "example.com/devcontainer-operator:v0.0.1" By("building the manager(Operator) image") cmd := exec.Command("make", "docker-build", fmt.Sprintf("IMG=%s", projectimage))