From c8f1daedbf7261fae357ecdd768780c1596ab1fe Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Thu, 16 May 2024 19:44:39 +0100 Subject: [PATCH] remove configManager --- .../config/default/manager_config_patch.yaml | 10 --- .../config/default/manager_config_patch.yaml | 10 --- .../common/kustomize/v2/scaffolds/init.go | 1 - .../config/kdefault/manager_config_patch.go | 53 -------------- .../manager/controller_manager_config.go | 73 ------------------- .../config/default/manager_config_patch.yaml | 10 --- .../config/default/manager_config_patch.yaml | 10 --- .../config/default/manager_config_patch.yaml | 10 --- .../config/default/manager_config_patch.yaml | 10 --- .../config/default/manager_config_patch.yaml | 10 --- 10 files changed, 197 deletions(-) delete mode 100644 docs/book/src/cronjob-tutorial/testdata/project/config/default/manager_config_patch.yaml delete mode 100644 docs/book/src/getting-started/testdata/project/config/default/manager_config_patch.yaml delete mode 100644 pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/manager_config_patch.go delete mode 100644 pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/controller_manager_config.go delete mode 100644 testdata/project-v4-multigroup-with-deploy-image/config/default/manager_config_patch.yaml delete mode 100644 testdata/project-v4-multigroup/config/default/manager_config_patch.yaml delete mode 100644 testdata/project-v4-with-deploy-image/config/default/manager_config_patch.yaml delete mode 100644 testdata/project-v4-with-grafana/config/default/manager_config_patch.yaml delete mode 100644 testdata/project-v4/config/default/manager_config_patch.yaml diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/default/manager_config_patch.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/default/manager_config_patch.yaml deleted file mode 100644 index f6f58916922..00000000000 --- a/docs/book/src/cronjob-tutorial/testdata/project/config/default/manager_config_patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager diff --git a/docs/book/src/getting-started/testdata/project/config/default/manager_config_patch.yaml b/docs/book/src/getting-started/testdata/project/config/default/manager_config_patch.yaml deleted file mode 100644 index f6f58916922..00000000000 --- a/docs/book/src/getting-started/testdata/project/config/default/manager_config_patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/init.go b/pkg/plugins/common/kustomize/v2/scaffolds/init.go index 47f52a4d2f1..c7c6bbb7db6 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/init.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/init.go @@ -76,7 +76,6 @@ func (s *initScaffolder) Scaffold() error { &kdefault.ManagerMetricsPatch{}, &manager.Config{Image: imageName}, &kdefault.Kustomization{}, - &kdefault.ManagerConfigPatch{}, &prometheus.Kustomization{}, &prometheus.Monitor{}, } diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/manager_config_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/manager_config_patch.go deleted file mode 100644 index 34395fdffc6..00000000000 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/manager_config_patch.go +++ /dev/null @@ -1,53 +0,0 @@ -/* -Copyright 2020 The Kubernetes Authors. - -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. -*/ - -package kdefault - -import ( - "path/filepath" - - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" -) - -var _ machinery.Template = &ManagerConfigPatch{} - -// ManagerConfigPatch scaffolds a ManagerConfigPatch for a Resource -type ManagerConfigPatch struct { - machinery.TemplateMixin -} - -// SetTemplateDefaults implements input.Template -func (f *ManagerConfigPatch) SetTemplateDefaults() error { - if f.Path == "" { - f.Path = filepath.Join("config", "default", "manager_config_patch.yaml") - } - - f.TemplateBody = managerConfigPatchTemplate - - return nil -} - -const managerConfigPatchTemplate = `apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager -` diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/controller_manager_config.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/controller_manager_config.go deleted file mode 100644 index 90178e367db..00000000000 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/controller_manager_config.go +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright 2020 The Kubernetes Authors. - -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. -*/ - -package manager - -import ( - "path/filepath" - - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" -) - -var _ machinery.Template = &ControllerManagerConfig{} - -// ControllerManagerConfig scaffolds the config file in config/manager folder. -type ControllerManagerConfig struct { - machinery.TemplateMixin - machinery.DomainMixin - machinery.RepositoryMixin - machinery.ProjectNameMixin -} - -// SetTemplateDefaults implements input.Template -func (f *ControllerManagerConfig) SetTemplateDefaults() error { - if f.Path == "" { - f.Path = filepath.Join("config", "manager", "controller_manager_config.yaml") - } - - f.TemplateBody = controllerManagerConfigTemplate - - f.IfExistsAction = machinery.Error - - return nil -} - -const controllerManagerConfigTemplate = `apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 -kind: ControllerManagerConfig -metadata: - labels: - app.kubernetes.io/name: {{ .ProjectName }} - app.kubernetes.io/managed-by: kustomize -health: - healthProbeBindAddress: :8081 -metrics: - bindAddress: 127.0.0.1:8080 -webhook: - port: 9443 -leaderElection: - leaderElect: true - resourceName: {{ hashFNV .Repo }}.{{ .Domain }} -# leaderElectionReleaseOnCancel defines if the leader should step down volume -# when the Manager ends. This requires the binary to immediately end when the -# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly -# speeds up voluntary leader transitions as the new leader don't have to wait -# LeaseDuration time first. -# In the default scaffold provided, the program ends immediately after -# the manager stops, so would be fine to enable this option. However, -# if you are doing or is intended to do any operation such as perform cleanups -# after the manager stops then its usage might be unsafe. -# leaderElectionReleaseOnCancel: true -` diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/default/manager_config_patch.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/default/manager_config_patch.yaml deleted file mode 100644 index f6f58916922..00000000000 --- a/testdata/project-v4-multigroup-with-deploy-image/config/default/manager_config_patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager diff --git a/testdata/project-v4-multigroup/config/default/manager_config_patch.yaml b/testdata/project-v4-multigroup/config/default/manager_config_patch.yaml deleted file mode 100644 index f6f58916922..00000000000 --- a/testdata/project-v4-multigroup/config/default/manager_config_patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager diff --git a/testdata/project-v4-with-deploy-image/config/default/manager_config_patch.yaml b/testdata/project-v4-with-deploy-image/config/default/manager_config_patch.yaml deleted file mode 100644 index f6f58916922..00000000000 --- a/testdata/project-v4-with-deploy-image/config/default/manager_config_patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager diff --git a/testdata/project-v4-with-grafana/config/default/manager_config_patch.yaml b/testdata/project-v4-with-grafana/config/default/manager_config_patch.yaml deleted file mode 100644 index f6f58916922..00000000000 --- a/testdata/project-v4-with-grafana/config/default/manager_config_patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager diff --git a/testdata/project-v4/config/default/manager_config_patch.yaml b/testdata/project-v4/config/default/manager_config_patch.yaml deleted file mode 100644 index f6f58916922..00000000000 --- a/testdata/project-v4/config/default/manager_config_patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager