From dc831615a7a6438588ae959e03f7702db753b0e9 Mon Sep 17 00:00:00 2001 From: Sujeet Date: Thu, 30 Nov 2023 16:25:17 +0530 Subject: [PATCH] Refactor and rename project to `gardener-extension-provider-ironcore` (#426) --- .github/dependabot.yml | 6 +- .github/workflows/publish-docker.yml | 8 +- CODEOWNERS | 4 +- CODE_OF_CONDUCT.md | 2 +- Dockerfile | 16 +- Makefile | 16 +- README.md | 8 +- .../.helmignore | 0 .../Chart.yaml | 5 + .../charts/application/Chart.yaml | 2 +- .../charts/application/templates/_helpers.tpl | 0 .../charts/application/templates/rbac.yaml | 0 .../application/templates/serviceaccount.yaml | 0 .../validatingwebhook-validator.yaml | 8 +- .../charts/application/values.yaml | 0 .../charts/runtime/Chart.yaml | 2 +- .../charts/runtime/templates/_helpers.tpl | 0 .../charts/runtime/templates/deployment.yaml | 26 +- .../templates/poddisruptionbudget.yaml | 0 .../charts/runtime/templates/secret-cert.yaml | 2 +- .../runtime/templates/secret-kubeconfig.yaml | 2 +- .../charts/runtime/templates/service.yaml | 0 .../runtime/templates/serviceaccount.yaml | 0 .../charts/runtime/templates/vpa.yaml | 0 .../charts/runtime/values.yaml | 0 .../templates/_helpers.tpl | 2 +- .../values.yaml | 2 +- .../Chart.yaml | 5 - .../Chart.yaml | 5 + .../doc.go | 4 +- .../templates/_helpers.tpl | 2 +- .../configmap-imagevector-overwrite.yaml | 0 .../templates/configmap-logging.yaml | 12 +- .../templates/configmap.yaml | 2 +- .../templates/deployment.yaml | 4 +- .../templates/poddisruptionbudget.yaml | 0 .../templates/rbac.yaml | 2 +- .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/storageclass.yaml | 2 +- .../templates/vpa.yaml | 0 .../values.yaml | 18 +- .../Chart.yaml | 5 - charts/images.go | 2 +- charts/images.yaml | 14 +- .../seed/templates/deployment.yaml | 16 +- .../seed/templates/vpa.yaml | 12 +- .../seed/values.yaml | 8 +- .../templates/cloud-controller-manager.yaml | 10 +- .../templates/vpa.yaml | 2 +- .../templates/csi-driver-controller-vpa.yaml | 10 +- .../templates/csi-driver-controller.yaml | 12 +- .../templates/storageclasses.yaml | 2 +- .../rbac-cloud-controller-manager.yaml | 2 +- .../csi-driver-node/templates/_helpers.tpl | 4 +- .../csi-driver-node/templates/daemonset.yaml | 2 +- .../app/app.go | 16 +- .../main.go | 4 +- .../app/app.go | 46 +- .../main.go | 4 +- docs/development/local-setup.md | 10 +- docs/operations/deployment.md | 10 +- docs/operations/operations.md | 30 +- docs/usage/usage.md | 40 +- example/00-componentconfig.yaml | 2 +- example/10-fake-shoot-controlplane.yaml | 16 +- example/30-backupbucket.yaml | 4 +- example/30-backupentry.yaml | 8 +- example/30-bastion.yaml | 4 +- example/30-controlplane.yaml | 22 +- example/30-infrastructure.yaml | 20 +- example/30-worker.yaml | 20 +- .../40-validatingwebhookconfiguration.yaml | 12 +- .../tls.crt | 0 .../tls.key | 0 example/controller-registration.yaml | 20 +- example/doc.go | 2 +- go.mod | 20 +- go.sum | 34 +- hack/api-reference/api.json | 4 +- hack/api-reference/api.md | 86 ++-- hack/api-reference/config.md | 50 +- hack/api-reference/template/tools.go | 2 +- hack/boilerplate.go.txt | 2 +- ...tal.sh => dev-setup-admission-ironcore.sh} | 4 +- hack/update-codegen.sh | 10 +- hack/update-github-templates.sh | 2 +- pkg/admission/cmd/options.go | 4 +- pkg/admission/decode.go | 13 +- pkg/admission/validator/secret.go | 8 +- pkg/admission/validator/secretbinding.go | 8 +- pkg/admission/validator/secretbinding_test.go | 4 +- pkg/admission/validator/shoot.go | 30 +- .../validator/validator_suite_test.go | 2 +- pkg/admission/validator/webhook.go | 12 +- pkg/apis/config/doc.go | 6 +- pkg/apis/config/install/install.go | 6 +- pkg/apis/config/loader/loader.go | 6 +- pkg/apis/config/register.go | 4 +- pkg/apis/config/types.go | 10 +- pkg/apis/config/v1alpha1/defaults.go | 2 +- pkg/apis/config/v1alpha1/doc.go | 10 +- pkg/apis/config/v1alpha1/register.go | 4 +- pkg/apis/config/v1alpha1/types.go | 10 +- .../v1alpha1/zz_generated.conversion.go | 4 +- .../config/v1alpha1/zz_generated.deepcopy.go | 2 +- .../config/v1alpha1/zz_generated.defaults.go | 2 +- pkg/apis/config/zz_generated.deepcopy.go | 2 +- pkg/apis/{onmetal => ironcore}/doc.go | 6 +- .../{onmetal => ironcore}/helper/scheme.go | 8 +- .../{onmetal => ironcore}/install/install.go | 8 +- pkg/apis/{onmetal => ironcore}/register.go | 6 +- .../types_cloudprofile.go | 4 +- .../types_controlplane.go | 4 +- .../types_infrastructure.go | 4 +- .../{onmetal => ironcore}/types_worker.go | 4 +- .../v1alpha1/defaults.go | 2 +- .../{onmetal => ironcore}/v1alpha1/doc.go | 10 +- .../v1alpha1/register.go | 4 +- .../v1alpha1/types_cloudprofile.go | 2 +- .../v1alpha1/types_controlplane.go | 2 +- .../v1alpha1/types_infrastructure.go | 4 +- .../v1alpha1/types_worker.go | 4 +- .../v1alpha1/v1alpha1_suite_test.go | 2 +- .../v1alpha1/zz_generated.conversion.go | 432 ++++++++++++++++++ .../v1alpha1/zz_generated.deepcopy.go | 2 +- .../v1alpha1/zz_generated.defaults.go | 2 +- .../validation/cloudprofile.go | 8 +- .../validation/cloudprofile_test.go | 32 +- .../validation/controlplane.go | 6 +- .../validation/controlplane_test.go | 10 +- .../validation/infrastructure.go | 8 +- .../validation/infrastructure_test.go | 8 +- .../validation/secret.go | 18 +- .../validation/secret_test.go | 2 +- .../{onmetal => ironcore}/validation/shoot.go | 4 +- .../validation/validation_suite_test.go | 0 .../zz_generated.deepcopy.go | 4 +- .../v1alpha1/zz_generated.conversion.go | 432 ------------------ pkg/cmd/config.go | 6 +- pkg/cmd/options.go | 20 +- pkg/controller/backupbucket/actuator.go | 20 +- pkg/controller/backupbucket/actuator_test.go | 10 +- pkg/controller/backupbucket/add.go | 10 +- pkg/controller/backupbucket/backupbucket.go | 40 +- pkg/controller/backupbucket/suite_test.go | 22 +- pkg/controller/backupentry/actuator.go | 2 +- pkg/controller/backupentry/actuator_test.go | 10 +- pkg/controller/backupentry/add.go | 8 +- pkg/controller/backupentry/backupentry.go | 16 +- pkg/controller/backupentry/suite_test.go | 18 +- pkg/controller/bastion/actuator.go | 4 +- pkg/controller/bastion/actuator_delete.go | 13 +- .../bastion/actuator_delete_test.go | 13 +- pkg/controller/bastion/actuator_reconcile.go | 44 +- .../bastion/actuator_reconcile_test.go | 16 +- pkg/controller/bastion/add.go | 11 +- pkg/controller/bastion/configvalidator.go | 14 +- .../bastion/configvalidator_test.go | 11 +- pkg/controller/bastion/ignition/config.go | 2 +- pkg/controller/bastion/ignition/template.yaml | 8 +- pkg/controller/bastion/options.go | 4 +- pkg/controller/bastion/suite_test.go | 30 +- pkg/controller/bastion/utils.go | 4 +- pkg/controller/controlplane/add.go | 14 +- pkg/controller/controlplane/constants.go | 2 +- pkg/controller/controlplane/suite_test.go | 20 +- pkg/controller/controlplane/valuesprovider.go | 148 +++--- .../controlplane/valuesprovider_test.go | 70 +-- pkg/controller/healthcheck/add.go | 14 +- pkg/controller/infrastructure/actuator.go | 2 +- .../infrastructure/actuator_delete.go | 32 +- .../infrastructure/actuator_delete_test.go | 12 +- .../infrastructure/actuator_migrate.go | 2 +- .../infrastructure/actuator_reconcile.go | 48 +- .../infrastructure/actuator_reconcile_test.go | 20 +- .../infrastructure/actuator_restore.go | 2 +- pkg/controller/infrastructure/add.go | 8 +- .../infrastructure/configvalidator.go | 24 +- .../infrastructure/configvalidator_test.go | 12 +- pkg/controller/infrastructure/suite_test.go | 24 +- pkg/controller/worker/actuator.go | 12 +- pkg/controller/worker/add.go | 8 +- .../worker/machine_controller_manager.go | 34 +- pkg/controller/worker/machine_dependencies.go | 2 +- pkg/controller/worker/machine_images.go | 6 +- pkg/controller/worker/machine_images_test.go | 6 +- pkg/controller/worker/machines.go | 32 +- pkg/controller/worker/machines_test.go | 16 +- pkg/controller/worker/suite_test.go | 14 +- pkg/internal/imagevector/imagevector.go | 4 +- pkg/internal/types.go | 2 +- pkg/{onmetal => ironcore}/clientutils.go | 38 +- pkg/{onmetal => ironcore}/helper/helper.go | 6 +- pkg/{onmetal => ironcore}/predicate.go | 8 +- pkg/{onmetal => ironcore}/suite_test.go | 4 +- pkg/{onmetal => ironcore}/types.go | 26 +- pkg/webhook/cloudprovider/add.go | 8 +- pkg/webhook/cloudprovider/ensurer.go | 22 +- pkg/webhook/cloudprovider/ensurer_test.go | 4 +- pkg/webhook/controlplane/add.go | 8 +- pkg/webhook/controlplane/ensurer.go | 20 +- pkg/webhook/controlplane/ensurer_test.go | 12 +- 203 files changed, 1532 insertions(+), 1533 deletions(-) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/.helmignore (100%) create mode 100644 charts/gardener-extension-admission-ironcore/Chart.yaml rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/application/Chart.yaml (71%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/application/templates/_helpers.tpl (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/application/templates/rbac.yaml (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/application/templates/serviceaccount.yaml (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/application/templates/validatingwebhook-validator.yaml (87%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/application/values.yaml (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/Chart.yaml (72%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/templates/_helpers.tpl (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/templates/deployment.yaml (77%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/templates/poddisruptionbudget.yaml (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/templates/secret-cert.yaml (91%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/templates/secret-kubeconfig.yaml (85%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/templates/service.yaml (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/templates/serviceaccount.yaml (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/templates/vpa.yaml (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/charts/runtime/values.yaml (100%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/templates/_helpers.tpl (93%) rename charts/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/values.yaml (93%) delete mode 100644 charts/gardener-extension-admission-onmetal/Chart.yaml create mode 100644 charts/gardener-extension-provider-ironcore/Chart.yaml rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/doc.go (74%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/_helpers.tpl (93%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/configmap-imagevector-overwrite.yaml (100%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/configmap-logging.yaml (75%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/configmap.yaml (95%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/deployment.yaml (96%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/poddisruptionbudget.yaml (100%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/rbac.yaml (98%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/service.yaml (100%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/serviceaccount.yaml (100%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/storageclass.yaml (88%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/templates/vpa.yaml (100%) rename charts/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/values.yaml (73%) delete mode 100644 charts/gardener-extension-provider-onmetal/Chart.yaml rename cmd/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/app/app.go (82%) rename cmd/{gardener-extension-admission-onmetal => gardener-extension-admission-ironcore}/main.go (87%) rename cmd/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/app/app.go (82%) rename cmd/{gardener-extension-provider-onmetal => gardener-extension-provider-ironcore}/main.go (87%) rename example/{admission-onmetal-certs => admission-ironcore-certs}/tls.crt (100%) rename example/{admission-onmetal-certs => admission-ironcore-certs}/tls.key (100%) rename hack/{dev-setup-admission-onmetal.sh => dev-setup-admission-ironcore.sh} (92%) rename pkg/apis/{onmetal => ironcore}/doc.go (75%) rename pkg/apis/{onmetal => ironcore}/helper/scheme.go (91%) rename pkg/apis/{onmetal => ironcore}/install/install.go (82%) rename pkg/apis/{onmetal => ironcore}/register.go (93%) rename pkg/apis/{onmetal => ironcore}/types_cloudprofile.go (98%) rename pkg/apis/{onmetal => ironcore}/types_controlplane.go (95%) rename pkg/apis/{onmetal => ironcore}/types_infrastructure.go (94%) rename pkg/apis/{onmetal => ironcore}/types_worker.go (97%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/defaults.go (95%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/doc.go (63%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/register.go (94%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/types_cloudprofile.go (98%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/types_controlplane.go (97%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/types_infrastructure.go (93%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/types_worker.go (96%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/v1alpha1_suite_test.go (95%) create mode 100644 pkg/apis/ironcore/v1alpha1/zz_generated.conversion.go rename pkg/apis/{onmetal => ironcore}/v1alpha1/zz_generated.deepcopy.go (99%) rename pkg/apis/{onmetal => ironcore}/v1alpha1/zz_generated.defaults.go (95%) rename pkg/apis/{onmetal => ironcore}/validation/cloudprofile.go (87%) rename pkg/apis/{onmetal => ironcore}/validation/cloudprofile_test.go (85%) rename pkg/apis/{onmetal => ironcore}/validation/controlplane.go (82%) rename pkg/apis/{onmetal => ironcore}/validation/controlplane_test.go (86%) rename pkg/apis/{onmetal => ironcore}/validation/infrastructure.go (79%) rename pkg/apis/{onmetal => ironcore}/validation/infrastructure_test.go (88%) rename pkg/apis/{onmetal => ironcore}/validation/secret.go (76%) rename pkg/apis/{onmetal => ironcore}/validation/secret_test.go (98%) rename pkg/apis/{onmetal => ironcore}/validation/shoot.go (96%) rename pkg/apis/{onmetal => ironcore}/validation/validation_suite_test.go (100%) rename pkg/apis/{onmetal => ironcore}/zz_generated.deepcopy.go (99%) delete mode 100644 pkg/apis/onmetal/v1alpha1/zz_generated.conversion.go rename pkg/{onmetal => ironcore}/clientutils.go (66%) rename pkg/{onmetal => ironcore}/helper/helper.go (90%) rename pkg/{onmetal => ironcore}/predicate.go (79%) rename pkg/{onmetal => ironcore}/suite_test.go (93%) rename pkg/{onmetal => ironcore}/types.go (87%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a3c798e4..73f2b813 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,18 +7,18 @@ updates: interval: "weekly" open-pull-requests-limit: 10 reviewers: - - "onmetal/gardener-extension-maintainers" + - "ironcore-dev/integration" - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" open-pull-requests-limit: 10 reviewers: - - "onmetal/gardener-extension-maintainers" + - "ironcore-dev/integration" - package-ecosystem: "docker" directory: "/" schedule: interval: "weekly" open-pull-requests-limit: 10 reviewers: - - "onmetal/gardener-extension-maintainers" + - "ironcore-dev/integration" diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index a6d6e562..fe76c422 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -29,10 +29,10 @@ jobs: strategy: matrix: image: - - name: gardener-extension-provider-onmetal - target: gardener-extension-provider-onmetal - - name: gardener-extension-admission-onmetal - target: gardener-extension-admission-onmetal + - name: gardener-extension-provider-ironcore + target: gardener-extension-provider-ironcore + - name: gardener-extension-admission-ironcore + target: gardener-extension-admission-ironcore if: ${{ github.event.label.name == 'ok-to-image' }} || ${{ github.event.label.name == 'ok-to-🐳' }} || ${{ github.ref == 'refs/heads/main' }} runs-on: ubuntu-latest steps: diff --git a/CODEOWNERS b/CODEOWNERS index b81df90e..c7f68433 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ -# onmetal-csi-driver maintainers -* @onmetal/gardener-extension-maintainers +# gardener-extension-provider-ironcore maintainers +* @ironcore-dev/integration diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f6059eb9..eaa8e3ec 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1 +1 @@ -Please refer to the [Gardener on Metal code of conduct](https://onmetal.github.io/documentation/contribute/overview/#code-of-conduct). \ No newline at end of file +Please refer to the [IronCore code of conduct](https://ironcore-dev.github.io/documentation/contribute/overview/#code-of-conduct). \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index ccdee829..7054b8c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,23 +24,23 @@ ARG TARGETARCH # Build RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ - CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -o gardener-extension-provider-onmetal ./cmd/gardener-extension-provider-onmetal/main.go && \ - CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -o gardener-extension-admission-onmetal ./cmd/gardener-extension-admission-onmetal/main.go + CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -o gardener-extension-provider-ironcore ./cmd/gardener-extension-provider-ironcore/main.go && \ + CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -o gardener-extension-admission-ironcore ./cmd/gardener-extension-admission-ironcore/main.go # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM gcr.io/distroless/static:nonroot AS gardener-extension-provider-onmetal +FROM gcr.io/distroless/static:nonroot AS gardener-extension-provider-ironcore WORKDIR / COPY charts /charts -COPY --from=builder /workspace/gardener-extension-provider-onmetal /gardener-extension-provider-onmetal +COPY --from=builder /workspace/gardener-extension-provider-ironcore /gardener-extension-provider-ironcore USER 65532:65532 -ENTRYPOINT ["/gardener-extension-provider-onmetal"] +ENTRYPOINT ["/gardener-extension-provider-ironcore"] -FROM gcr.io/distroless/static:nonroot AS gardener-extension-admission-onmetal +FROM gcr.io/distroless/static:nonroot AS gardener-extension-admission-ironcore WORKDIR / COPY charts /charts -COPY --from=builder /workspace/gardener-extension-admission-onmetal /gardener-extension-admission-onmetal +COPY --from=builder /workspace/gardener-extension-admission-ironcore /gardener-extension-admission-ironcore USER 65532:65532 -ENTRYPOINT ["/gardener-extension-admission-onmetal"] \ No newline at end of file +ENTRYPOINT ["/gardener-extension-admission-ironcore"] \ No newline at end of file diff --git a/Makefile b/Makefile index 715983d1..48f5e78a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ EXTENSION_PREFIX := gardener-extension -NAME := provider-onmetal +NAME := provider-ironcore REGISTRY := ghcr.io -ADMISSION_NAME := admission-onmetal +ADMISSION_NAME := admission-ironcore IMAGE_PREFIX := $(REGISTRY)/extensions REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) HACK_DIR := $(REPO_ROOT)/hack @@ -56,7 +56,7 @@ MOCKGEN ?= $(LOCALBIN)/mockgen ## Tool Versions KUSTOMIZE_VERSION ?= v3.8.7 CONTROLLER_TOOLS_VERSION ?= v0.13.0 -VGOPATH_VERSION ?= v0.1.2 +VGOPATH_VERSION ?= v0.1.3 CODE_GENERATOR_VERSION ?= v0.28.3 ADDLICENSE_VERSION ?= v1.1.1 GOIMPORTS_VERSION ?= v0.14.0 @@ -89,7 +89,7 @@ start-admission: ./cmd/$(EXTENSION_PREFIX)-$(ADMISSION_NAME) \ --webhook-config-server-host=0.0.0.0 \ --webhook-config-server-port=9443 \ - --webhook-config-cert-dir=./example/admission-onmetal-certs + --webhook-config-cert-dir=./example/admission-ironcore-certs ################################################################# # Rules related to binary build, Docker image build and release # @@ -124,11 +124,11 @@ clean: $(CLEAN) .PHONY: add-license add-license: addlicense ## Add license headers to all go files. - find . -name '*.go' -exec $(ADDLICENSE) -c 'OnMetal authors' {} + + find . -name '*.go' -exec $(ADDLICENSE) -c 'IronCore authors' {} + .PHONY: check-license check-license: addlicense ## Check that every file has a license header present. - find . -name '*.go' -exec $(ADDLICENSE) -check -c 'OnMetal authors' {} + + find . -name '*.go' -exec $(ADDLICENSE) -check -c 'IronCore authors' {} + .PHONY: check check: generate generate-charts add-license fmt lint test # Generate manifests, code, lint, add licenses, test @@ -153,7 +153,7 @@ generate-charts: .PHONY: docs docs: gen-crd-api-reference-docs ## Run go generate to generate API reference documentation. - $(GEN_CRD_API_REFERENCE_DOCS) -api-dir ./pkg/apis/onmetal/v1alpha1 -config ./hack/api-reference/api.json -template-dir ./hack/api-reference/template -out-file ./hack/api-reference/api.md + $(GEN_CRD_API_REFERENCE_DOCS) -api-dir ./pkg/apis/ironcore/v1alpha1 -config ./hack/api-reference/api.json -template-dir ./hack/api-reference/template -out-file ./hack/api-reference/api.md $(GEN_CRD_API_REFERENCE_DOCS) -api-dir ./pkg/apis/config/v1alpha1 -config ./hack/api-reference/config.json -template-dir ./hack/api-reference/template -out-file ./hack/api-reference/config.md .PHONY: format @@ -216,7 +216,7 @@ $(ENVTEST): $(LOCALBIN) .PHONY: vgopath vgopath: $(VGOPATH) ## Download vgopath locally if necessary. $(VGOPATH): $(LOCALBIN) - test -s $(LOCALBIN)/vgopath || GOBIN=$(LOCALBIN) go install github.com/onmetal/vgopath@$(VGOPATH_VERSION) + test -s $(LOCALBIN)/vgopath || GOBIN=$(LOCALBIN) go install github.com/ironcore-dev/vgopath@$(VGOPATH_VERSION) .PHONY: deepcopy-gen deepcopy-gen: $(DEEPCOPY_GEN) ## Download deepcopy-gen locally if necessary. diff --git a/README.md b/README.md index 5635ae54..c2ffb99b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# [Gardener Extension for Onmetal provider](https://gardener.cloud) +# [Gardener Extension for IronCore provider](https://gardener.cloud) -[![Go Report Card](https://goreportcard.com/badge/github.com/onmetal/gardener-extension-provider-onmetal)](https://goreportcard.com/report/github.com/onmetal/gardener-extension-provider-onmetal) +[![Go Report Card](https://goreportcard.com/badge/github.com/ironcore-dev/gardener-extension-provider-ironcore)](https://goreportcard.com/report/github.com/ironcore-dev/gardener-extension-provider-ironcore) Project Gardener implements the automated management and operation of [Kubernetes](https://kubernetes.io/) clusters as a service. Its main principle is to leverage Kubernetes concepts for all of its tasks. @@ -10,7 +10,7 @@ However, the project has grown to a size where it is very hard to extend, mainta With [GEP-1](https://github.com/gardener/gardener/blob/master/docs/proposals/01-extensibility.md) we have proposed how the architecture can be changed in a way to support external controllers that contain their very own vendor specifics. This way, we can keep Gardener core clean and independent. -This controller implements Gardener's extension contract for the Gardener on Metal (Onmetal) provider. +This controller implements Gardener's extension contract for the IronCore provider. An example for a `ControllerRegistration` resource that can be used to register this controller to Gardener can be found [here](example/controller-registration.yaml). @@ -37,7 +37,7 @@ Static code checks and tests can be executed by running `make verify`. We are us ## Feedback and Support -Feedback and contributions are always welcome. Please report bugs or suggestions as [GitHub issues](https://github.com/onmetal/gardener-extension-provider-onmetal/issues) or join our [Slack channel #gardener](https://kubernetes.slack.com/messages/gardener) (please invite yourself to the Kubernetes workspace [here](http://slack.k8s.io)). +Feedback and contributions are always welcome. Please report bugs or suggestions as [GitHub issues](https://github.com/ironcore-dev/gardener-extension-provider-ironcore/issues) or join our [Slack channel #gardener](https://kubernetes.slack.com/messages/gardener) (please invite yourself to the Kubernetes workspace [here](http://slack.k8s.io)). ## Learn more! diff --git a/charts/gardener-extension-admission-onmetal/.helmignore b/charts/gardener-extension-admission-ironcore/.helmignore similarity index 100% rename from charts/gardener-extension-admission-onmetal/.helmignore rename to charts/gardener-extension-admission-ironcore/.helmignore diff --git a/charts/gardener-extension-admission-ironcore/Chart.yaml b/charts/gardener-extension-admission-ironcore/Chart.yaml new file mode 100644 index 00000000..814352e2 --- /dev/null +++ b/charts/gardener-extension-admission-ironcore/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: "1.0" +description: A Helm chart for the IronCore gardener-extension-admission-ironcore +name: gardener-extension-admission-ironcore +version: 0.1.0 diff --git a/charts/gardener-extension-admission-onmetal/charts/application/Chart.yaml b/charts/gardener-extension-admission-ironcore/charts/application/Chart.yaml similarity index 71% rename from charts/gardener-extension-admission-onmetal/charts/application/Chart.yaml rename to charts/gardener-extension-admission-ironcore/charts/application/Chart.yaml index 6e924476..806cdbd4 100644 --- a/charts/gardener-extension-admission-onmetal/charts/application/Chart.yaml +++ b/charts/gardener-extension-admission-ironcore/charts/application/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v1 -description: A Helm chart to deploy the gardener-extension-admission-onmetal application related resources +description: A Helm chart to deploy the gardener-extension-admission-ironcore application related resources name: application version: 0.1.0 diff --git a/charts/gardener-extension-admission-onmetal/charts/application/templates/_helpers.tpl b/charts/gardener-extension-admission-ironcore/charts/application/templates/_helpers.tpl similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/application/templates/_helpers.tpl rename to charts/gardener-extension-admission-ironcore/charts/application/templates/_helpers.tpl diff --git a/charts/gardener-extension-admission-onmetal/charts/application/templates/rbac.yaml b/charts/gardener-extension-admission-ironcore/charts/application/templates/rbac.yaml similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/application/templates/rbac.yaml rename to charts/gardener-extension-admission-ironcore/charts/application/templates/rbac.yaml diff --git a/charts/gardener-extension-admission-onmetal/charts/application/templates/serviceaccount.yaml b/charts/gardener-extension-admission-ironcore/charts/application/templates/serviceaccount.yaml similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/application/templates/serviceaccount.yaml rename to charts/gardener-extension-admission-ironcore/charts/application/templates/serviceaccount.yaml diff --git a/charts/gardener-extension-admission-onmetal/charts/application/templates/validatingwebhook-validator.yaml b/charts/gardener-extension-admission-ironcore/charts/application/templates/validatingwebhook-validator.yaml similarity index 87% rename from charts/gardener-extension-admission-onmetal/charts/application/templates/validatingwebhook-validator.yaml rename to charts/gardener-extension-admission-ironcore/charts/application/templates/validatingwebhook-validator.yaml index d7fbd345..d2180f05 100644 --- a/charts/gardener-extension-admission-onmetal/charts/application/templates/validatingwebhook-validator.yaml +++ b/charts/gardener-extension-admission-ironcore/charts/application/templates/validatingwebhook-validator.yaml @@ -3,7 +3,7 @@ kind: ValidatingWebhookConfiguration metadata: name: {{ include "name" . }} webhooks: -- name: validation.onmetal.provider.extensions.gardener.cloud +- name: validation.ironcore.provider.extensions.gardener.cloud rules: - apiGroups: - "core.gardener.cloud" @@ -21,7 +21,7 @@ webhooks: objectSelector: {{- if .Values.global.webhookConfig.useObjectSelector }} matchLabels: - provider.extensions.gardener.cloud/onmetal: "true" + provider.extensions.gardener.cloud/ironcore: "true" {{- end }} namespaceSelector: {} sideEffects: None @@ -38,7 +38,7 @@ webhooks: path: /webhooks/validate {{- end }} caBundle: {{ required ".Values.global.webhookConfig.caBundle is required" .Values.global.webhookConfig.caBundle | b64enc }} -- name: secrets.validation.onmetal.provider.extensions.gardener.cloud +- name: secrets.validation.ironcore.provider.extensions.gardener.cloud rules: - apiGroups: - "" @@ -51,7 +51,7 @@ webhooks: failurePolicy: Fail objectSelector: matchLabels: - provider.shoot.gardener.cloud/onmetal: "true" + provider.shoot.gardener.cloud/ironcore: "true" namespaceSelector: {} sideEffects: None admissionReviewVersions: diff --git a/charts/gardener-extension-admission-onmetal/charts/application/values.yaml b/charts/gardener-extension-admission-ironcore/charts/application/values.yaml similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/application/values.yaml rename to charts/gardener-extension-admission-ironcore/charts/application/values.yaml diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/Chart.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/Chart.yaml similarity index 72% rename from charts/gardener-extension-admission-onmetal/charts/runtime/Chart.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/Chart.yaml index 7b6cd525..41fd594b 100644 --- a/charts/gardener-extension-admission-onmetal/charts/runtime/Chart.yaml +++ b/charts/gardener-extension-admission-ironcore/charts/runtime/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v1 -description: A Helm chart to deploy the gardener-extension-admission-onmetal runtime related resources +description: A Helm chart to deploy the gardener-extension-admission-ironcore runtime related resources name: runtime version: 0.1.0 diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/_helpers.tpl b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/_helpers.tpl similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/runtime/templates/_helpers.tpl rename to charts/gardener-extension-admission-ironcore/charts/runtime/templates/_helpers.tpl diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/deployment.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/deployment.yaml similarity index 77% rename from charts/gardener-extension-admission-onmetal/charts/runtime/templates/deployment.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/templates/deployment.yaml index 4a63e299..955e2852 100644 --- a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/deployment.yaml +++ b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/deployment.yaml @@ -14,9 +14,9 @@ spec: template: metadata: annotations: - checksum/secret-gardener-extension-admission-onmetal-cert: {{ include (print $.Template.BasePath "/secret-cert.yaml") . | sha256sum }} + checksum/secret-gardener-extension-admission-ironcore-cert: {{ include (print $.Template.BasePath "/secret-cert.yaml") . | sha256sum }} {{- if .Values.global.kubeconfig }} - checksum/gardener-extension-admission-onmetal-kubeconfig: {{ include (print $.Template.BasePath "/secret-kubeconfig.yaml") . | sha256sum }} + checksum/gardener-extension-admission-ironcore-kubeconfig: {{ include (print $.Template.BasePath "/secret-kubeconfig.yaml") . | sha256sum }} {{- end }} labels: {{ include "labels" . | indent 8 }} @@ -40,11 +40,11 @@ spec: image: {{ include "image" .Values.global.image }} imagePullPolicy: {{ .Values.global.image.pullPolicy }} command: - - /gardener-extension-admission-onmetal + - /gardener-extension-admission-ironcore - --webhook-config-server-port={{ .Values.global.webhookConfig.serverPort }} - - --webhook-config-cert-dir=/etc/gardener-extension-admission-onmetal/srv + - --webhook-config-cert-dir=/etc/gardener-extension-admission-ironcore/srv {{- if .Values.global.kubeconfig }} - - --kubeconfig=/etc/gardener-extension-admission-onmetal/kubeconfig/kubeconfig + - --kubeconfig=/etc/gardener-extension-admission-ironcore/kubeconfig/kubeconfig {{- end }} {{- if .Values.global.metricsPort }} - --metrics-bind-address=:{{ .Values.global.metricsPort }} @@ -71,12 +71,12 @@ spec: {{ toYaml .Values.global.resources | nindent 10 }} {{- end }} volumeMounts: - - name: gardener-extension-admission-onmetal-cert - mountPath: /etc/gardener-extension-admission-onmetal/srv + - name: gardener-extension-admission-ironcore-cert + mountPath: /etc/gardener-extension-admission-ironcore/srv readOnly: true {{- if .Values.global.kubeconfig }} - - name: gardener-extension-admission-onmetal-kubeconfig - mountPath: /etc/gardener-extension-admission-onmetal/kubeconfig + - name: gardener-extension-admission-ironcore-kubeconfig + mountPath: /etc/gardener-extension-admission-ironcore/kubeconfig readOnly: true {{- end }} {{- if .Values.global.serviceAccountTokenVolumeProjection.enabled }} @@ -85,14 +85,14 @@ spec: readOnly: true {{- end }} volumes: - - name: gardener-extension-admission-onmetal-cert + - name: gardener-extension-admission-ironcore-cert secret: - secretName: gardener-extension-admission-onmetal-cert + secretName: gardener-extension-admission-ironcore-cert defaultMode: 420 {{- if .Values.global.kubeconfig }} - - name: gardener-extension-admission-onmetal-kubeconfig + - name: gardener-extension-admission-ironcore-kubeconfig secret: - secretName: gardener-extension-admission-onmetal-kubeconfig + secretName: gardener-extension-admission-ironcore-kubeconfig defaultMode: 420 {{- end }} {{- if .Values.global.serviceAccountTokenVolumeProjection.enabled }} diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/poddisruptionbudget.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/poddisruptionbudget.yaml similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/runtime/templates/poddisruptionbudget.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/templates/poddisruptionbudget.yaml diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/secret-cert.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/secret-cert.yaml similarity index 91% rename from charts/gardener-extension-admission-onmetal/charts/runtime/templates/secret-cert.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/templates/secret-cert.yaml index 0caf3103..7fa3a121 100644 --- a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/secret-cert.yaml +++ b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/secret-cert.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: gardener-extension-admission-onmetal-cert + name: gardener-extension-admission-ironcore-cert namespace: {{ .Release.Namespace }} labels: app: gardener diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/secret-kubeconfig.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/secret-kubeconfig.yaml similarity index 85% rename from charts/gardener-extension-admission-onmetal/charts/runtime/templates/secret-kubeconfig.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/templates/secret-kubeconfig.yaml index 3dcf36c5..4fb69c38 100644 --- a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/secret-kubeconfig.yaml +++ b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/secret-kubeconfig.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: gardener-extension-admission-onmetal-kubeconfig + name: gardener-extension-admission-ironcore-kubeconfig namespace: "{{ .Release.Namespace }}" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/service.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/service.yaml similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/runtime/templates/service.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/templates/service.yaml diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/serviceaccount.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/serviceaccount.yaml similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/runtime/templates/serviceaccount.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/templates/serviceaccount.yaml diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/templates/vpa.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/templates/vpa.yaml similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/runtime/templates/vpa.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/templates/vpa.yaml diff --git a/charts/gardener-extension-admission-onmetal/charts/runtime/values.yaml b/charts/gardener-extension-admission-ironcore/charts/runtime/values.yaml similarity index 100% rename from charts/gardener-extension-admission-onmetal/charts/runtime/values.yaml rename to charts/gardener-extension-admission-ironcore/charts/runtime/values.yaml diff --git a/charts/gardener-extension-admission-onmetal/templates/_helpers.tpl b/charts/gardener-extension-admission-ironcore/templates/_helpers.tpl similarity index 93% rename from charts/gardener-extension-admission-onmetal/templates/_helpers.tpl rename to charts/gardener-extension-admission-ironcore/templates/_helpers.tpl index 027189e1..bea79b3e 100644 --- a/charts/gardener-extension-admission-onmetal/templates/_helpers.tpl +++ b/charts/gardener-extension-admission-ironcore/templates/_helpers.tpl @@ -1,5 +1,5 @@ {{- define "name" -}} -gardener-extension-admission-onmetal +gardener-extension-admission-ironcore {{- end -}} {{- define "labels.app.key" -}} diff --git a/charts/gardener-extension-admission-onmetal/values.yaml b/charts/gardener-extension-admission-ironcore/values.yaml similarity index 93% rename from charts/gardener-extension-admission-onmetal/values.yaml rename to charts/gardener-extension-admission-ironcore/values.yaml index 341fb3c7..d28d5799 100644 --- a/charts/gardener-extension-admission-onmetal/values.yaml +++ b/charts/gardener-extension-admission-ironcore/values.yaml @@ -4,7 +4,7 @@ global: user: name: "" image: - repository: ghcr.io/onmetal/gardener-extension-admission-onmetal + repository: ghcr.io/ironcore-dev/gardener-extension-admission-ironcore tag: latest pullPolicy: IfNotPresent replicaCount: 1 diff --git a/charts/gardener-extension-admission-onmetal/Chart.yaml b/charts/gardener-extension-admission-onmetal/Chart.yaml deleted file mode 100644 index 60f41bfe..00000000 --- a/charts/gardener-extension-admission-onmetal/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the Gardener on Metal gardener-extension-admission-onmetal -name: gardener-extension-admission-onmetal -version: 0.1.0 diff --git a/charts/gardener-extension-provider-ironcore/Chart.yaml b/charts/gardener-extension-provider-ironcore/Chart.yaml new file mode 100644 index 00000000..1bc4d4c7 --- /dev/null +++ b/charts/gardener-extension-provider-ironcore/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: "1.0" +description: A Helm chart for the Gardener ironcore Provider extension +name: gardener-extension-provider-ironcore +version: 0.1.0 diff --git a/charts/gardener-extension-provider-onmetal/doc.go b/charts/gardener-extension-provider-ironcore/doc.go similarity index 74% rename from charts/gardener-extension-provider-onmetal/doc.go rename to charts/gardener-extension-provider-ironcore/doc.go index df311b7b..ff3b4ff2 100644 --- a/charts/gardener-extension-provider-onmetal/doc.go +++ b/charts/gardener-extension-provider-ironcore/doc.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate sh -c "../../hack/generate-controller-registration.sh provider-onmetal . $(cat ../../VERSION) ../../example/controller-registration.yaml BackupBucket:onmetal BackupEntry:onmetal Bastion:onmetal ControlPlane:onmetal Infrastructure:onmetal Worker:onmetal" +//go:generate sh -c "../../hack/generate-controller-registration.sh provider-ironcore . $(cat ../../VERSION) ../../example/controller-registration.yaml BackupBucket:ironcore BackupEntry:ironcore Bastion:ironcore ControlPlane:ironcore Infrastructure:ironcore Worker:ironcore" // Package chart enables go:generate support for generating the correct controller registration. package chart diff --git a/charts/gardener-extension-provider-onmetal/templates/_helpers.tpl b/charts/gardener-extension-provider-ironcore/templates/_helpers.tpl similarity index 93% rename from charts/gardener-extension-provider-onmetal/templates/_helpers.tpl rename to charts/gardener-extension-provider-ironcore/templates/_helpers.tpl index cd54b3ef..58c4c3a2 100644 --- a/charts/gardener-extension-provider-onmetal/templates/_helpers.tpl +++ b/charts/gardener-extension-provider-ironcore/templates/_helpers.tpl @@ -1,5 +1,5 @@ {{- define "name" -}} -gardener-extension-provider-onmetal +gardener-extension-provider-ironcore {{- end -}} {{- define "labels.app.key" -}} diff --git a/charts/gardener-extension-provider-onmetal/templates/configmap-imagevector-overwrite.yaml b/charts/gardener-extension-provider-ironcore/templates/configmap-imagevector-overwrite.yaml similarity index 100% rename from charts/gardener-extension-provider-onmetal/templates/configmap-imagevector-overwrite.yaml rename to charts/gardener-extension-provider-ironcore/templates/configmap-imagevector-overwrite.yaml diff --git a/charts/gardener-extension-provider-onmetal/templates/configmap-logging.yaml b/charts/gardener-extension-provider-ironcore/templates/configmap-logging.yaml similarity index 75% rename from charts/gardener-extension-provider-onmetal/templates/configmap-logging.yaml rename to charts/gardener-extension-provider-ironcore/templates/configmap-logging.yaml index 1625a894..f4d66557 100644 --- a/charts/gardener-extension-provider-onmetal/templates/configmap-logging.yaml +++ b/charts/gardener-extension-provider-ironcore/templates/configmap-logging.yaml @@ -9,28 +9,28 @@ data: filter-kubernetes.conf: | [FILTER] Name parser - Match kubernetes.*cloud-controller-manager*onmetal-cloud-controller-manager* + Match kubernetes.*cloud-controller-manager*ironcore-cloud-controller-manager* Key_Name log Parser kubeapiserverParser Reserve_Data True [FILTER] Name parser - Match kubernetes.*machine-controller-manager*onmetal-machine-controller-manager* + Match kubernetes.*machine-controller-manager*ironcore-machine-controller-manager* Key_Name log Parser kubeapiserverParser Reserve_Data True [FILTER] Name parser - Match kubernetes.*machine-controller-manager*machine-controller-manager-provider-onmetal* + Match kubernetes.*machine-controller-manager*machine-controller-manager-provider-ironcore* Key_Name log Parser kubeapiserverParser Reserve_Data True [FILTER] Name parser - Match kubernetes.*csi-driver-controller*onmetal-csi* + Match kubernetes.*csi-driver-controller*ironcore-csi* Key_Name log Parser kubeapiserverParser Reserve_Data True @@ -38,11 +38,11 @@ data: [FILTER] Name modify Match kubernetes.* - Condition Key_value_matches tag ^kubernetes\.var\.log\.containers\.(cloud-controller-manager-.+?_.+?_onmetal-cloud-controller-manager|csi-driver-controller-.+?_.+?_onmetal-csi) + Condition Key_value_matches tag ^kubernetes\.var\.log\.containers\.(cloud-controller-manager-.+?_.+?_ironcore-cloud-controller-manager|csi-driver-controller-.+?_.+?_ironcore-csi) Add __gardener_multitenant_id__ operator;user [FILTER] Name modify Match kubernetes.* - Condition Key_value_matches tag ^kubernetes\.var\.log\.containers\.machine-controller-manager-.+?_.+?_(onmetal-machine-controller-manager|machine-controller-manager-provider-onmetal) + Condition Key_value_matches tag ^kubernetes\.var\.log\.containers\.machine-controller-manager-.+?_.+?_(ironcore-machine-controller-manager|machine-controller-manager-provider-ironcore) Add __gardener_multitenant_id__ operator;user diff --git a/charts/gardener-extension-provider-onmetal/templates/configmap.yaml b/charts/gardener-extension-provider-ironcore/templates/configmap.yaml similarity index 95% rename from charts/gardener-extension-provider-onmetal/templates/configmap.yaml rename to charts/gardener-extension-provider-ironcore/templates/configmap.yaml index 111766a4..5cef6040 100644 --- a/charts/gardener-extension-provider-onmetal/templates/configmap.yaml +++ b/charts/gardener-extension-provider-ironcore/templates/configmap.yaml @@ -8,7 +8,7 @@ metadata: data: config.yaml: | --- - apiVersion: onmetal.provider.extensions.config.gardener.cloud/v1alpha1 + apiVersion: ironcore.provider.extensions.config.gardener.cloud/v1alpha1 kind: ControllerConfiguration {{- if .Values.config.clientConnection }} clientConnection: diff --git a/charts/gardener-extension-provider-onmetal/templates/deployment.yaml b/charts/gardener-extension-provider-ironcore/templates/deployment.yaml similarity index 96% rename from charts/gardener-extension-provider-onmetal/templates/deployment.yaml rename to charts/gardener-extension-provider-ironcore/templates/deployment.yaml index e9c9a160..62769aca 100644 --- a/charts/gardener-extension-provider-onmetal/templates/deployment.yaml +++ b/charts/gardener-extension-provider-ironcore/templates/deployment.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: {{- if .Values.imageVectorOverwrite }} - checksum/configmap-onmetal-imagevector-overwrite: {{ include (print $.Template.BasePath "/configmap-imagevector-overwrite.yaml") . | sha256sum }} + checksum/configmap-ironcore-imagevector-overwrite: {{ include (print $.Template.BasePath "/configmap-imagevector-overwrite.yaml") . | sha256sum }} {{- end }} checksum/configmap-{{ include "name" . }}-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} {{- if and .Values.metrics.enableScraping }} @@ -47,7 +47,7 @@ spec: image: {{ include "image" . }} imagePullPolicy: {{ .Values.image.pullPolicy }} command: - - /gardener-extension-provider-onmetal + - /gardener-extension-provider-ironcore - --backupbucket-max-concurrent-reconciles={{ .Values.controllers.backupbucket.concurrentSyncs }} - --backupentry-max-concurrent-reconciles={{ .Values.controllers.backupentry.concurrentSyncs }} - --config-file=/etc/{{ include "name" . }}/config/config.yaml diff --git a/charts/gardener-extension-provider-onmetal/templates/poddisruptionbudget.yaml b/charts/gardener-extension-provider-ironcore/templates/poddisruptionbudget.yaml similarity index 100% rename from charts/gardener-extension-provider-onmetal/templates/poddisruptionbudget.yaml rename to charts/gardener-extension-provider-ironcore/templates/poddisruptionbudget.yaml diff --git a/charts/gardener-extension-provider-onmetal/templates/rbac.yaml b/charts/gardener-extension-provider-ironcore/templates/rbac.yaml similarity index 98% rename from charts/gardener-extension-provider-onmetal/templates/rbac.yaml rename to charts/gardener-extension-provider-ironcore/templates/rbac.yaml index b61d44d3..1a475f63 100644 --- a/charts/gardener-extension-provider-onmetal/templates/rbac.yaml +++ b/charts/gardener-extension-provider-ironcore/templates/rbac.yaml @@ -47,7 +47,7 @@ rules: resources: - leases resourceNames: - - provider-onmetal-leader-election + - provider-ironcore-leader-election - gardener-extension-heartbeat verbs: - get diff --git a/charts/gardener-extension-provider-onmetal/templates/service.yaml b/charts/gardener-extension-provider-ironcore/templates/service.yaml similarity index 100% rename from charts/gardener-extension-provider-onmetal/templates/service.yaml rename to charts/gardener-extension-provider-ironcore/templates/service.yaml diff --git a/charts/gardener-extension-provider-onmetal/templates/serviceaccount.yaml b/charts/gardener-extension-provider-ironcore/templates/serviceaccount.yaml similarity index 100% rename from charts/gardener-extension-provider-onmetal/templates/serviceaccount.yaml rename to charts/gardener-extension-provider-ironcore/templates/serviceaccount.yaml diff --git a/charts/gardener-extension-provider-onmetal/templates/storageclass.yaml b/charts/gardener-extension-provider-ironcore/templates/storageclass.yaml similarity index 88% rename from charts/gardener-extension-provider-onmetal/templates/storageclass.yaml rename to charts/gardener-extension-provider-ironcore/templates/storageclass.yaml index 0b473018..b12d2a1e 100644 --- a/charts/gardener-extension-provider-onmetal/templates/storageclass.yaml +++ b/charts/gardener-extension-provider-ironcore/templates/storageclass.yaml @@ -1,4 +1,4 @@ -{{- if eq .Values.gardener.seed.provider "onmetal" }} +{{- if eq .Values.gardener.seed.provider "ironcore" }} apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: diff --git a/charts/gardener-extension-provider-onmetal/templates/vpa.yaml b/charts/gardener-extension-provider-ironcore/templates/vpa.yaml similarity index 100% rename from charts/gardener-extension-provider-onmetal/templates/vpa.yaml rename to charts/gardener-extension-provider-ironcore/templates/vpa.yaml diff --git a/charts/gardener-extension-provider-onmetal/values.yaml b/charts/gardener-extension-provider-ironcore/values.yaml similarity index 73% rename from charts/gardener-extension-provider-onmetal/values.yaml rename to charts/gardener-extension-provider-ironcore/values.yaml index 6180bc1d..c8003730 100644 --- a/charts/gardener-extension-provider-onmetal/values.yaml +++ b/charts/gardener-extension-provider-ironcore/values.yaml @@ -1,5 +1,5 @@ image: - repository: ghcr.io/onmetal/gardener-extension-provider-onmetal + repository: ghcr.io/ironcore-dev/gardener-extension-provider-ironcore tag: latest pullPolicy: IfNotPresent @@ -47,16 +47,16 @@ ignoreResources: false #imageVectorOverwrite: | # images: # - name: cloud-controller-manager -# sourceRepository: github.com/onmetal/cloud-provider-onmetal -# repository: ghcr.io/onmetal/cloud-provider-onmetal +# sourceRepository: github.com/ironcore-dev/cloud-provider-ironcore +# repository: ghcr.io/ironcore-dev/cloud-provider-ironcore # tag: "sha-889754f" -# - name: machine-controller-manager-provider-onmetal -# sourceRepository: github.com/onmetal/machine-controller-manager-provider-onmetal -# repository: ghcr.io/onmetal/machine-controller-manager-provider-onmetal +# - name: machine-controller-manager-provider-ironcore +# sourceRepository: github.com/ironcore-dev/machine-controller-manager-provider-ironcore +# repository: ghcr.io/ironcore-dev/machine-controller-manager-provider-ironcore # tag: "sha-361a2de" # - name: csi-driver -# sourceRepository: github.com/onmetal/onmetal-csi-driver -# repository: ghcr.io/onmetal/onmetal-csi-driver +# sourceRepository: github.com/ironcore-dev/ironcore-csi-driver +# repository: ghcr.io/ironcore-dev/ironcore-csi-driver # tag: "v0.1.3" webhookConfig: @@ -95,4 +95,4 @@ gardener: gardenlet: featureGates: {} seed: - provider: onmetal + provider: ironcore diff --git a/charts/gardener-extension-provider-onmetal/Chart.yaml b/charts/gardener-extension-provider-onmetal/Chart.yaml deleted file mode 100644 index caad411e..00000000 --- a/charts/gardener-extension-provider-onmetal/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the Gardener onmetal Provider extension -name: gardener-extension-provider-onmetal -version: 0.1.0 diff --git a/charts/images.go b/charts/images.go index e3a1a311..d175e465 100644 --- a/charts/images.go +++ b/charts/images.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/charts/images.yaml b/charts/images.yaml index f7ad0db5..64564ad1 100644 --- a/charts/images.yaml +++ b/charts/images.yaml @@ -1,7 +1,7 @@ images: - name: cloud-controller-manager - sourceRepository: github.com/onmetal/cloud-provider-onmetal - repository: ghcr.io/onmetal/cloud-provider-onmetal + sourceRepository: github.com/ironcore-dev/cloud-provider-ironcore + repository: ghcr.io/ironcore-dev/cloud-provider-ironcore tag: "v0.2.0" labels: - name: 'gardener.cloud/cve-categorisation' @@ -26,9 +26,9 @@ images: confidentiality_requirement: 'high' integrity_requirement: 'high' availability_requirement: 'low' -- name: machine-controller-manager-provider-onmetal - sourceRepository: github.com/onmetal/machine-controller-manager-provider-onmetal - repository: ghcr.io/onmetal/machine-controller-manager-provider-onmetal +- name: machine-controller-manager-provider-ironcore + sourceRepository: github.com/ironcore-dev/machine-controller-manager-provider-ironcore + repository: ghcr.io/ironcore-dev/machine-controller-manager-provider-ironcore tag: "v0.1.8" labels: - name: 'gardener.cloud/cve-categorisation' @@ -41,8 +41,8 @@ images: availability_requirement: 'low' - name: csi-driver - sourceRepository: github.com/onmetal/onmetal-csi-driver - repository: ghcr.io/onmetal/onmetal-csi-driver + sourceRepository: github.com/ironcore-dev/ironcore-csi-driver + repository: ghcr.io/ironcore-dev/ironcore-csi-driver tag: "v0.2.0" labels: - name: 'gardener.cloud/cve-categorisation' diff --git a/charts/internal/machine-controller-manager/seed/templates/deployment.yaml b/charts/internal/machine-controller-manager/seed/templates/deployment.yaml index 5b839f9b..96c93844 100644 --- a/charts/internal/machine-controller-manager/seed/templates/deployment.yaml +++ b/charts/internal/machine-controller-manager/seed/templates/deployment.yaml @@ -38,12 +38,12 @@ spec: serviceAccountName: machine-controller-manager terminationGracePeriodSeconds: 5 containers: - - name: machine-controller-manager-provider-onmetal - image: {{ index .Values.images "machine-controller-manager-provider-onmetal" }} + - name: machine-controller-manager-provider-ironcore + image: {{ index .Values.images "machine-controller-manager-provider-ironcore" }} imagePullPolicy: IfNotPresent command: - ./machine-controller - - --onmetal-kubeconfig=/etc/onmetal/kubeconfig + - --ironcore-kubeconfig=/etc/ironcore/kubeconfig - --control-kubeconfig=inClusterConfig - --machine-creation-timeout=20m - --machine-drain-timeout=2h @@ -52,14 +52,14 @@ spec: - --machine-safety-apiserver-statuscheck-period=1m - --machine-safety-orphan-vms-period=30m - --namespace={{ .Release.Namespace }} - - --port={{ .Values.metricsPortOnmetal }} + - --port={{ .Values.metricsPortIroncore }} - --target-kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig - --v=4 livenessProbe: failureThreshold: 3 httpGet: path: /healthz - port: {{ .Values.metricsPortOnmetal }} + port: {{ .Values.metricsPortIroncore }} scheme: HTTP initialDelaySeconds: 30 periodSeconds: 10 @@ -68,15 +68,15 @@ spec: terminationMessagePath: /dev/termination-log terminationMessagePolicy: File resources: -{{ toYaml .Values.resources.mcmProviderOnmetal | indent 10 }} +{{ toYaml .Values.resources.mcmProviderIroncore | indent 10 }} volumeMounts: - mountPath: /var/run/secrets/gardener.cloud/shoot/generic-kubeconfig name: kubeconfig readOnly: true - - mountPath: /etc/onmetal + - mountPath: /etc/ironcore name: cloudprovider readOnly: true - - name: onmetal-machine-controller-manager + - name: ironcore-machine-controller-manager image: {{ index .Values.images "machine-controller-manager" }} imagePullPolicy: IfNotPresent command: diff --git a/charts/internal/machine-controller-manager/seed/templates/vpa.yaml b/charts/internal/machine-controller-manager/seed/templates/vpa.yaml index 6ef0a4f9..11af1510 100644 --- a/charts/internal/machine-controller-manager/seed/templates/vpa.yaml +++ b/charts/internal/machine-controller-manager/seed/templates/vpa.yaml @@ -13,15 +13,15 @@ spec: updateMode: {{ .Values.vpa.updatePolicy.updateMode | quote }} resourcePolicy: containerPolicies: - - containerName: machine-controller-manager-provider-onmetal + - containerName: machine-controller-manager-provider-ironcore minAllowed: - cpu: {{ .Values.resources.mcmProviderOnmetal.requests.cpu }} - memory: {{ .Values.resources.mcmProviderOnmetal.requests.memory }} + cpu: {{ .Values.resources.mcmProviderIroncore.requests.cpu }} + memory: {{ .Values.resources.mcmProviderIroncore.requests.memory }} maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.mcmProviderOnmetal.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.mcmProviderOnmetal.maxAllowed.memory }} + cpu: {{ .Values.vpa.resourcePolicy.mcmProviderIroncore.maxAllowed.cpu }} + memory: {{ .Values.vpa.resourcePolicy.mcmProviderIroncore.maxAllowed.memory }} controlledValues: RequestsOnly - - containerName: onmetal-machine-controller-manager + - containerName: ironcore-machine-controller-manager minAllowed: cpu: {{ .Values.resources.mcm.requests.cpu }} memory: {{ .Values.resources.mcm.requests.memory }} diff --git a/charts/internal/machine-controller-manager/seed/values.yaml b/charts/internal/machine-controller-manager/seed/values.yaml index b1e7cb16..c6e57ae2 100644 --- a/charts/internal/machine-controller-manager/seed/values.yaml +++ b/charts/internal/machine-controller-manager/seed/values.yaml @@ -1,6 +1,6 @@ images: machine-controller-manager: image-repository:image-tag - machine-controller-manager-provider-onmetal: image-repository:image-tag + machine-controller-manager-provider-ironcore: image-repository:image-tag replicas: 1 @@ -17,7 +17,7 @@ namespace: uid: uuid-of-namespace metricsPort: 10258 -metricsPortOnmetal: 10259 +metricsPortIroncore: 10259 vpa: enabled: true @@ -28,7 +28,7 @@ vpa: maxAllowed: cpu: 2 memory: 5G - mcmProviderOnmetal: + mcmProviderIroncore: maxAllowed: cpu: 2 memory: 5G @@ -40,7 +40,7 @@ resources: memory: 72Mi limits: memory: 400Mi - mcmProviderOnmetal: + mcmProviderIroncore: requests: cpu: 30m memory: 64Mi diff --git a/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/cloud-controller-manager.yaml b/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/cloud-controller-manager.yaml index 6012f3c4..ee4bcc9e 100644 --- a/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/cloud-controller-manager.yaml +++ b/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/cloud-controller-manager.yaml @@ -34,13 +34,13 @@ spec: automountServiceAccountToken: false priorityClassName: gardener-system-300 containers: - - name: onmetal-cloud-controller-manager + - name: ironcore-cloud-controller-manager image: {{ index .Values.images "cloud-controller-manager" }} imagePullPolicy: IfNotPresent command: - - /onmetal-cloud-controller-manager - - --cloud-provider=onmetal - - --onmetal-kubeconfig=/etc/onmetal/kubeconfig + - /ironcore-cloud-controller-manager + - --cloud-provider=ironcore + - --ironcore-kubeconfig=/etc/ironcore/kubeconfig - --cloud-config=/etc/kubernetes/cloudprovider/cloudprovider.conf - --cluster-cidr={{ .Values.podNetwork }} - --cluster-name={{ .Values.clusterName }} @@ -86,7 +86,7 @@ spec: - name: cloud-provider-config mountPath: /etc/kubernetes/cloudprovider - name: cloudprovider - mountPath: /etc/onmetal + mountPath: /etc/ironcore dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler diff --git a/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/vpa.yaml b/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/vpa.yaml index 68faf4cf..81772448 100644 --- a/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/vpa.yaml +++ b/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/vpa.yaml @@ -12,7 +12,7 @@ spec: updateMode: Auto resourcePolicy: containerPolicies: - - containerName: onmetal-cloud-controller-manager + - containerName: ironcore-cloud-controller-manager minAllowed: cpu: {{ .Values.resources.requests.cpu }} memory: {{ .Values.resources.requests.memory }} diff --git a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml index aa7423a9..43e5512a 100644 --- a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml +++ b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml @@ -7,35 +7,35 @@ metadata: spec: resourcePolicy: containerPolicies: - - containerName: onmetal-csi-driver + - containerName: ironcore-csi-driver minAllowed: memory: {{ .Values.resources.driver.requests.memory }} maxAllowed: cpu: {{ .Values.vpa.resourcePolicy.driver.maxAllowed.cpu }} memory: {{ .Values.vpa.resourcePolicy.driver.maxAllowed.memory }} controlledValues: RequestsOnly - - containerName: onmetal-csi-provisioner + - containerName: ironcore-csi-provisioner minAllowed: memory: {{ .Values.resources.provisioner.requests.memory }} maxAllowed: cpu: {{ .Values.vpa.resourcePolicy.provisioner.maxAllowed.cpu }} memory: {{ .Values.vpa.resourcePolicy.provisioner.maxAllowed.memory }} controlledValues: RequestsOnly - - containerName: onmetal-csi-attacher + - containerName: ironcore-csi-attacher minAllowed: memory: {{ .Values.resources.attacher.requests.memory }} maxAllowed: cpu: {{ .Values.vpa.resourcePolicy.attacher.maxAllowed.cpu }} memory: {{ .Values.vpa.resourcePolicy.attacher.maxAllowed.memory }} controlledValues: RequestsOnly - - containerName: onmetal-csi-resizer + - containerName: ironcore-csi-resizer minAllowed: memory: {{ .Values.resources.resizer.requests.memory }} maxAllowed: cpu: {{ .Values.vpa.resourcePolicy.resizer.maxAllowed.cpu }} memory: {{ .Values.vpa.resourcePolicy.resizer.maxAllowed.memory }} controlledValues: RequestsOnly - - containerName: onmetal-csi-liveness-probe + - containerName: ironcore-csi-liveness-probe minAllowed: memory: {{ .Values.resources.livenessProbe.requests.memory }} maxAllowed: diff --git a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller.yaml b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller.yaml index f75e99b2..280edf49 100644 --- a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller.yaml +++ b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller.yaml @@ -37,12 +37,12 @@ spec: automountServiceAccountToken: false priorityClassName: gardener-system-300 containers: - - name: onmetal-csi-driver + - name: ironcore-csi-driver image: {{ index .Values.images "csi-driver" }} imagePullPolicy: IfNotPresent args : - --target-kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig - - --onmetal-kubeconfig=/srv/cloudprovider/kubeconfig + - --ironcore-kubeconfig=/srv/cloudprovider/kubeconfig env: - name: CSI_ENDPOINT value: unix://{{ .Values.socketPath }}/csi.sock @@ -84,7 +84,7 @@ spec: name: kubeconfig-csi-driver readOnly: true - - name: onmetal-csi-provisioner + - name: ironcore-csi-provisioner image: {{ index .Values.images "csi-provisioner" }} imagePullPolicy: IfNotPresent args: @@ -110,7 +110,7 @@ spec: name: kubeconfig-csi-provisioner readOnly: true - - name: onmetal-csi-attacher + - name: ironcore-csi-attacher image: {{ index .Values.images "csi-attacher" }} imagePullPolicy: IfNotPresent args: @@ -133,7 +133,7 @@ spec: name: kubeconfig-csi-attacher readOnly: true - - name: onmetal-csi-resizer + - name: ironcore-csi-resizer image: {{ index .Values.images "csi-resizer" }} imagePullPolicy: IfNotPresent args: @@ -157,7 +157,7 @@ spec: name: kubeconfig-csi-resizer readOnly: true - - name: onmetal-csi-liveness-probe + - name: ironcore-csi-liveness-probe image: {{ index .Values.images "csi-liveness-probe" }} args: - --csi-address=/csi/csi.sock diff --git a/charts/internal/shoot-storageclasses/templates/storageclasses.yaml b/charts/internal/shoot-storageclasses/templates/storageclasses.yaml index d2fdca1a..839f6db0 100644 --- a/charts/internal/shoot-storageclasses/templates/storageclasses.yaml +++ b/charts/internal/shoot-storageclasses/templates/storageclasses.yaml @@ -18,7 +18,7 @@ allowVolumeExpansion: true {{- else }} allowVolumeExpansion: false {{- end }} -provisioner: csi.onmetal.de +provisioner: csi.ironcore.dev reclaimPolicy: Delete volumeBindingMode: WaitForFirstConsumer {{- end }} \ No newline at end of file diff --git a/charts/internal/shoot-system-components/charts/cloud-controller-manager/templates/rbac-cloud-controller-manager.yaml b/charts/internal/shoot-system-components/charts/cloud-controller-manager/templates/rbac-cloud-controller-manager.yaml index 20d2eb5d..6f246cc1 100644 --- a/charts/internal/shoot-system-components/charts/cloud-controller-manager/templates/rbac-cloud-controller-manager.yaml +++ b/charts/internal/shoot-system-components/charts/cloud-controller-manager/templates/rbac-cloud-controller-manager.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: extensions.gardener.cloud:provider-onmetal:cloud-controller-manager + name: extensions.gardener.cloud:provider-ironcore:cloud-controller-manager annotations: resources.gardener.cloud/keep-object: "true" roleRef: diff --git a/charts/internal/shoot-system-components/charts/csi-driver-node/templates/_helpers.tpl b/charts/internal/shoot-system-components/charts/csi-driver-node/templates/_helpers.tpl index 34ee1e6a..b9d1f843 100644 --- a/charts/internal/shoot-system-components/charts/csi-driver-node/templates/_helpers.tpl +++ b/charts/internal/shoot-system-components/charts/csi-driver-node/templates/_helpers.tpl @@ -3,11 +3,11 @@ extensions.gardener.cloud {{- end -}} {{- define "csi-driver-node.name" -}} -provider-onmetal +provider-ironcore {{- end -}} {{- define "csi-driver-node.provisioner" -}} -csi.onmetal.de +csi.ironcore.dev {{- end -}} {{- define "csi-driver-node.storageversion" -}} diff --git a/charts/internal/shoot-system-components/charts/csi-driver-node/templates/daemonset.yaml b/charts/internal/shoot-system-components/charts/csi-driver-node/templates/daemonset.yaml index bf42359c..9d31a224 100644 --- a/charts/internal/shoot-system-components/charts/csi-driver-node/templates/daemonset.yaml +++ b/charts/internal/shoot-system-components/charts/csi-driver-node/templates/daemonset.yaml @@ -16,7 +16,7 @@ spec: template: metadata: annotations: - node.gardener.cloud/wait-for-csi-node-onmetal: {{ include "csi-driver-node.provisioner" . }} + node.gardener.cloud/wait-for-csi-node-ironcore: {{ include "csi-driver-node.provisioner" . }} labels: node.gardener.cloud/critical-component: "true" app: csi diff --git a/cmd/gardener-extension-admission-onmetal/app/app.go b/cmd/gardener-extension-admission-ironcore/app/app.go similarity index 82% rename from cmd/gardener-extension-admission-onmetal/app/app.go rename to cmd/gardener-extension-admission-ironcore/app/app.go index 6807f128..4d305ed3 100644 --- a/cmd/gardener-extension-admission-onmetal/app/app.go +++ b/cmd/gardener-extension-admission-ironcore/app/app.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -30,14 +30,14 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" - admissioncmd "github.com/onmetal/gardener-extension-provider-onmetal/pkg/admission/cmd" - onmetalinstall "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/install" - provideronmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + admissioncmd "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/admission/cmd" + ironcoreinstall "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/install" + providerironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) -var log = logf.Log.WithName("gardener-extension-admission-onmetal") +var log = logf.Log.WithName("gardener-extension-admission-ironcore") -// NewAdmissionCommand creates a new command for running a onmetal gardener-extension-admission-onmetal webhook. +// NewAdmissionCommand creates a new command for running a ironcore gardener-extension-admission-ironcore webhook. func NewAdmissionCommand(ctx context.Context) *cobra.Command { var ( restOpts = &controllercmd.RESTOptions{} @@ -58,7 +58,7 @@ func NewAdmissionCommand(ctx context.Context) *cobra.Command { ) cmd := &cobra.Command{ - Use: fmt.Sprintf("admission-%s", provideronmetal.Type), + Use: fmt.Sprintf("admission-%s", providerironcore.Type), RunE: func(cmd *cobra.Command, args []string) error { verflag.PrintAndExitIfRequested() @@ -79,7 +79,7 @@ func NewAdmissionCommand(ctx context.Context) *cobra.Command { install.Install(mgr.GetScheme()) - if err := onmetalinstall.AddToScheme(mgr.GetScheme()); err != nil { + if err := ironcoreinstall.AddToScheme(mgr.GetScheme()); err != nil { return fmt.Errorf("could not update manager scheme: %v", err) } diff --git a/cmd/gardener-extension-admission-onmetal/main.go b/cmd/gardener-extension-admission-ironcore/main.go similarity index 87% rename from cmd/gardener-extension-admission-onmetal/main.go rename to cmd/gardener-extension-admission-ironcore/main.go index 6168c029..24124f1a 100644 --- a/cmd/gardener-extension-admission-onmetal/main.go +++ b/cmd/gardener-extension-admission-ironcore/main.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import ( runtimelog "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager/signals" - "github.com/onmetal/gardener-extension-provider-onmetal/cmd/gardener-extension-admission-onmetal/app" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/cmd/gardener-extension-admission-ironcore/app" ) func main() { diff --git a/cmd/gardener-extension-provider-onmetal/app/app.go b/cmd/gardener-extension-provider-ironcore/app/app.go similarity index 82% rename from cmd/gardener-extension-provider-onmetal/app/app.go rename to cmd/gardener-extension-provider-ironcore/app/app.go index c31efd57..ff24ef0f 100644 --- a/cmd/gardener-extension-provider-onmetal/app/app.go +++ b/cmd/gardener-extension-provider-ironcore/app/app.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -29,17 +29,17 @@ import ( webhookcmd "github.com/gardener/gardener/extensions/pkg/webhook/cmd" gardenerhealthz "github.com/gardener/gardener/pkg/healthz" machinev1alpha1 "github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1" - onmetalinstall "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/install" - onmetalcmd "github.com/onmetal/gardener-extension-provider-onmetal/pkg/cmd" - backupbucketcontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/backupbucket" - backupentrycontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/backupentry" - bastioncontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/bastion" - onmetalcontrolplane "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/controlplane" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/healthcheck" - infrastructurecontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/infrastructure" - workercontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/worker" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - controlplanewebhook "github.com/onmetal/gardener-extension-provider-onmetal/pkg/webhook/controlplane" + ironcoreinstall "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/install" + ironcorecmd "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/cmd" + backupbucketcontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/backupbucket" + backupentrycontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/backupentry" + bastioncontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/bastion" + ironcorecontrolplane "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/controlplane" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/healthcheck" + infrastructurecontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/infrastructure" + workercontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/worker" + ironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + controlplanewebhook "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/webhook/controlplane" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" autoscalingv1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1" @@ -48,21 +48,21 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" ) -// NewControllerManagerCommand creates a new command for running a onmetal provider controller. +// NewControllerManagerCommand creates a new command for running a ironcore provider controller. func NewControllerManagerCommand(ctx context.Context) *cobra.Command { var ( generalOpts = &controllercmd.GeneralOptions{} restOpts = &controllercmd.RESTOptions{} mgrOpts = &controllercmd.ManagerOptions{ LeaderElection: true, - LeaderElectionID: controllercmd.LeaderElectionNameID(onmetal.ProviderName), + LeaderElectionID: controllercmd.LeaderElectionNameID(ironcore.ProviderName), LeaderElectionNamespace: os.Getenv("LEADER_ELECTION_NAMESPACE"), WebhookServerPort: 443, WebhookCertDir: "/tmp/gardener-extensions-cert", MetricsBindAddress: ":8080", HealthBindAddress: ":8081", } - configFileOpts = &onmetalcmd.ConfigOptions{} + configFileOpts = &ironcorecmd.ConfigOptions{} // options for the backupbucket controller backupBucketCtrlOpts = &controllercmd.ControllerOptions{ @@ -81,7 +81,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command { // options for the heartbeat controller heartbeatCtrlOpts = &heartbeatcmd.Options{ - ExtensionName: onmetal.ProviderName, + ExtensionName: ironcore.ProviderName, RenewIntervalSeconds: 30, Namespace: os.Getenv("LEADER_ELECTION_NAMESPACE"), } @@ -112,12 +112,12 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command { MaxConcurrentReconciles: 5, } - controllerSwitches = onmetalcmd.ControllerSwitchOptions() - webhookSwitches = onmetalcmd.WebhookSwitchOptions() + controllerSwitches = ironcorecmd.ControllerSwitchOptions() + webhookSwitches = ironcorecmd.WebhookSwitchOptions() webhookOptions = webhookcmd.NewAddToManagerOptions( - onmetal.ProviderName, + ironcore.ProviderName, genericactuator.ShootWebhooksResourceName, - genericactuator.ShootWebhookNamespaceSelector(onmetal.Type), + genericactuator.ShootWebhookNamespaceSelector(ironcore.Type), webhookServerOptions, webhookSwitches, ) @@ -142,7 +142,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command { ) cmd := &cobra.Command{ - Use: fmt.Sprintf("%s-controller-manager", onmetal.ProviderName), + Use: fmt.Sprintf("%s-controller-manager", ironcore.ProviderName), RunE: func(cmd *cobra.Command, args []string) error { verflag.PrintAndExitIfRequested() @@ -166,7 +166,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command { if err := extensionscontroller.AddToScheme(scheme); err != nil { return fmt.Errorf("could not update manager scheme: %w", err) } - if err := onmetalinstall.AddToScheme(scheme); err != nil { + if err := ironcoreinstall.AddToScheme(scheme); err != nil { return fmt.Errorf("could not update manager scheme: %w", err) } if err := druidv1alpha1.AddToScheme(scheme); err != nil { @@ -207,7 +207,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command { if _, err := webhookOptions.Completed().AddToManager(ctx, mgr); err != nil { return fmt.Errorf("could not add webhooks to manager: %w", err) } - onmetalcontrolplane.DefaultAddOptions.WebhookServerNamespace = webhookOptions.Server.Namespace + ironcorecontrolplane.DefaultAddOptions.WebhookServerNamespace = webhookOptions.Server.Namespace if err := controllerSwitches.Completed().AddToManager(ctx, mgr); err != nil { return fmt.Errorf("could not add controllers to manager: %w", err) diff --git a/cmd/gardener-extension-provider-onmetal/main.go b/cmd/gardener-extension-provider-ironcore/main.go similarity index 87% rename from cmd/gardener-extension-provider-onmetal/main.go rename to cmd/gardener-extension-provider-ironcore/main.go index f349003b..d8aa6b92 100644 --- a/cmd/gardener-extension-provider-onmetal/main.go +++ b/cmd/gardener-extension-provider-ironcore/main.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import ( "os" "github.com/gardener/gardener/pkg/logger" - "github.com/onmetal/gardener-extension-provider-onmetal/cmd/gardener-extension-provider-onmetal/app" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/cmd/gardener-extension-provider-ironcore/app" runtimelog "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager/signals" ) diff --git a/docs/development/local-setup.md b/docs/development/local-setup.md index 2c868c9b..7aead9ab 100644 --- a/docs/development/local-setup.md +++ b/docs/development/local-setup.md @@ -1,6 +1,6 @@ -### admission-onmetal +### admission-ironcore -`admission-onmetal` is an admission webhook server which is responsible for the validation of the cloud provider (onmetal in this case) specific fields and resources. The Gardener API server is cloud provider agnostic and it wouldn't be able to perform similar validation. +`admission-ironcore` is an admission webhook server which is responsible for the validation of the cloud provider (ironcore in this case) specific fields and resources. The Gardener API server is cloud provider agnostic and it wouldn't be able to perform similar validation. Follow the steps below to run the admission webhook server locally. @@ -18,10 +18,10 @@ Follow the steps below to run the admission webhook server locally. 1. Setup the `ValidatingWebhookConfiguration`. - `hack/dev-setup-admission-onmetal.sh` will configure the webhook Service which will allow the kube-apiserver of your local cluster to reach the webhook server. It will also apply the `ValidatingWebhookConfiguration` manifest. + `hack/dev-setup-admission-ironcore.sh` will configure the webhook Service which will allow the kube-apiserver of your local cluster to reach the webhook server. It will also apply the `ValidatingWebhookConfiguration` manifest. ```bash - ./hack/dev-setup-admission-onmetal.sh + ./hack/dev-setup-admission-ironcore.sh ``` -You are now ready to experiment with the `admission-onmetal` webhook server locally. +You are now ready to experiment with the `admission-ironcore` webhook server locally. diff --git a/docs/operations/deployment.md b/docs/operations/deployment.md index 32409318..42812769 100644 --- a/docs/operations/deployment.md +++ b/docs/operations/deployment.md @@ -1,10 +1,10 @@ -# Deployment of the onmetal provider extension +# Deployment of the ironcore provider extension -**Disclaimer:** This document is NOT a step-by-step installation guide for the `onmetal` provider extension and only +**Disclaimer:** This document is NOT a step-by-step installation guide for the `ironcore` provider extension and only contains some configuration specifics regarding the installation of different components via the helm charts residing -in the onmetal provider extension [repository](https://github.com/gardener/gardener-extension-provider-onmetal). +in the ironcore provider extension [repository](https://github.com/gardener/gardener-extension-provider-ironcore). -## gardener-extension-admission-onmetal +## gardener-extension-admission-ironcore ### Authentication against the Garden cluster @@ -13,7 +13,7 @@ There are several authentication possibilities depending on whether [the concept #### *Virtual Garden* is not used, i.e., the `runtime` Garden cluster is also the `target` Garden cluster. **Automounted Service Account Token** -The easiest way to deploy the `gardener-extension-admission-onmetal` component will be to not provide `kubeconfig` at +The easiest way to deploy the `gardener-extension-admission-ironcore` component will be to not provide `kubeconfig` at all. This way in-cluster configuration and an automounted service account token will be used. The drawback of this approach is that the automounted token will not be automatically rotated. diff --git a/docs/operations/operations.md b/docs/operations/operations.md index 86d73f31..8899b512 100644 --- a/docs/operations/operations.md +++ b/docs/operations/operations.md @@ -1,4 +1,4 @@ -# Using the onmetal provider extension with Gardener as operator +# Using the ironcore provider extension with Gardener as operator The [`core.gardener.cloud/v1beta1.CloudProfile` resource](https://github.com/gardener/gardener/blob/master/example/30-cloudprofile.yaml) declares a `providerConfig` field that is meant to contain provider-specific configuration. @@ -10,21 +10,21 @@ This document explains the necessary configuration for this provider extension. ## `CloudProfile` resource -This section describes, how the configuration for `CloudProfile`s looks like for `onmetal` by providing an example -`CloudProfile` manifest with minimal configuration that can be used to allow the creation of `onmetal` shoot clusters. +This section describes, how the configuration for `CloudProfile`s looks like for `ironcore` by providing an example +`CloudProfile` manifest with minimal configuration that can be used to allow the creation of `ironcore` shoot clusters. ### `CloudProfileConfig` -The cloud profile configuration contains information about the real machine image IDs in the `onmetal` environment. -You have to map every version that you specify in `.spec.machineImages[].versions` here such that the `onmetal` extension +The cloud profile configuration contains information about the real machine image IDs in the `ironcore` environment. +You have to map every version that you specify in `.spec.machineImages[].versions` here such that the `ironcore` extension knows the location of the OCI image artefact for every version you want to offer. For each machine image version an `architecture` field can be specified which specifies the CPU architecture of the machine on which given machine image can be used. -An example `CloudProfileConfig` for the `onmetal` extension looks as follows: +An example `CloudProfileConfig` for the `ironcore` extension looks as follows: ```yaml -apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 +apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: CloudProfileConfig machineImages: - name: gardenlinux @@ -42,9 +42,9 @@ Please find below an example `CloudProfile` manifest: apiVersion: core.gardener.cloud/v1beta1 kind: CloudProfile metadata: - name: onmetal + name: ironcore spec: - type: onmetal + type: ironcore kubernetes: versions: - version: 1.25.3 @@ -80,11 +80,11 @@ spec: - my-zone-b - my-zone-c providerConfig: - apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 + apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: CloudProfileConfig regionConfigs: - name: my-region - server: https://onmetal-api-server + server: https://ironcore-api-server certificateAuthorityData: >- abcd12345 storageClasses: @@ -116,7 +116,7 @@ metadata: name: my-seed spec: provider: - type: onmetal + type: ironcore ... ``` @@ -134,7 +134,7 @@ metadata: name: my-shoot namespace: my-namespace spec: - cloudProfileName: onmetal + cloudProfileName: ironcore secretBindingName: my-credentials region: my-region networking: @@ -142,9 +142,9 @@ spec: nodes: 10.1.0.0/16 provider: infrastructureConfig: - apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 + apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: InfrastructureConfig - type: onmetal + type: ironcore workers: - name: pool1 machine: diff --git a/docs/usage/usage.md b/docs/usage/usage.md index 0b24a0e5..6cc13944 100644 --- a/docs/usage/usage.md +++ b/docs/usage/usage.md @@ -1,20 +1,20 @@ -# Using the `onmetal` provider extension with Gardener as end-user +# Using the `ironcore` provider extension with Gardener as end-user The [`core.gardener.cloud/v1beta1.Shoot` resource](https://github.com/gardener/gardener/blob/master/example/90-shoot.yaml) declares a few fields that are meant to contain provider-specific configuration. -This document describes the configurable options for `onmetal` and provides an example `Shoot` manifest with minimal -configuration that can be used to create an `onmetal` cluster (modulo the landscape-specific information like cloud +This document describes the configurable options for `ironcore` and provides an example `Shoot` manifest with minimal +configuration that can be used to create an `ironcore` cluster (modulo the landscape-specific information like cloud profile names, secret binding names, etc.). -## `onmetal` Provider Credentials +## `ironcore` Provider Credentials -In order for Gardener to create a Kubernetes cluster using the `onmetal` infrastructure components, a Shoot has to -provide credentials with sufficient permissions to the desired `onmetal` project. +In order for Gardener to create a Kubernetes cluster using the `ironcore` infrastructure components, a Shoot has to +provide credentials with sufficient permissions to the desired `ironcore` project. -In the `onmetal` provider extension the infrastructure credential secret has to contain the following components: -`namespace` which is the namespace in the corresponding `onmetal` cluster, `username` which is the name of the -`ServiceAccount` in the `onmetal` cluster and a `token` which is the token generated for the `ServiceAccount`. An +In the `ironcore` provider extension the infrastructure credential secret has to contain the following components: +`namespace` which is the namespace in the corresponding `ironcore` cluster, `username` which is the name of the +`ServiceAccount` in the `ironcore` cluster and a `token` which is the token generated for the `ServiceAccount`. An example secret is shown below: ```yaml @@ -25,7 +25,7 @@ metadata: namespace: garden-dev type: Opaque data: - namespace: my-onmetal-namespace + namespace: my-ironcore-namespace token: abcd1234 username: my-serviceaccount-user ``` @@ -35,10 +35,10 @@ data: The infrastructure configuration mainly describes how the network layout looks like in order to create the shoot worker nodes in a later step, thus, prepares everything relevant to create VMs, load balancers, volumes, etc. -An example `InfrastructureConfig` for the `onmetal` extension looks as follows: +An example `InfrastructureConfig` for the `ironcore` extension looks as follows: ```yaml -apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 +apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: InfrastructureConfig networkRef: name: "my-network" @@ -50,14 +50,14 @@ Here the `networkRef` field refer to network and `prefixRef` field refer to pref ## `ControlPlaneConfig` -The control plane configuration mainly contains values for the `onmetal` specific control plane components. -Today, the only components deployed by the `onmetal` extension is the `cloud-controller-manager` and the -`onmetal-csi-driver`. +The control plane configuration mainly contains values for the `ironcore` specific control plane components. +Today, the only components deployed by the `ironcore` extension is the `cloud-controller-manager` and the +`ironcore-csi-driver`. -An example `ControlPlaneConfig` for the `onmetal` extension looks as follows: +An example `ControlPlaneConfig` for the `ironcore` extension looks as follows: ```yaml -apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 +apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: ControlPlaneConfig cloudControllerManager: featureGates: @@ -71,12 +71,12 @@ features, potentially impacting the cluster stability. If you don't want to conf ## WorkerConfig -At this moment the `onmetal` extension does not have any worker specific provider configuration. +At this moment the `ironcore` extension does not have any worker specific provider configuration. ## Example `Shoot` manifest - An example to a `Shoot` manifest [here](https://github.com/onmetal/gardener-extension-provider-onmetal/blob/doc/usage-as-operator/docs/usage-as-operator.md): + An example to a `Shoot` manifest [here](https://github.com/ironcore-dev/gardener-extension-provider-ironcore/blob/doc/usage-as-operator/docs/usage-as-operator.md): ## CSI volume provisioners -Every `onmetal` Shoot cluster will be deployed with the `onmetal-csi-driver`. +Every `ironcore` Shoot cluster will be deployed with the `ironcore-csi-driver`. diff --git a/example/00-componentconfig.yaml b/example/00-componentconfig.yaml index 081620a8..c020a97c 100644 --- a/example/00-componentconfig.yaml +++ b/example/00-componentconfig.yaml @@ -1,5 +1,5 @@ --- -apiVersion: onmetal.provider.extensions.config.gardener.cloud/v1alpha1 +apiVersion: ironcore.provider.extensions.config.gardener.cloud/v1alpha1 kind: ControllerConfiguration clientConnection: acceptContentTypes: application/json diff --git a/example/10-fake-shoot-controlplane.yaml b/example/10-fake-shoot-controlplane.yaml index 52bbe1c2..b7c84b0b 100644 --- a/example/10-fake-shoot-controlplane.yaml +++ b/example/10-fake-shoot-controlplane.yaml @@ -5,13 +5,13 @@ apiVersion: v1 kind: Namespace metadata: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore --- apiVersion: apps/v1 kind: Deployment metadata: name: etcd - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore spec: replicas: 1 selector: @@ -41,7 +41,7 @@ apiVersion: v1 kind: Service metadata: name: etcd - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore spec: ports: - port: 2379 @@ -53,7 +53,7 @@ apiVersion: v1 kind: Secret metadata: name: ca - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore type: Opaque data: ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrakNDQWVLZ0F3SUJBZ0lVVHAzWHZocldPVk04WkdlODZZb1hNVi9VSjdBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZURVRNQkVHQTFVRUF4TUthM1ZpWlhKdVpYUmxjekFlRncweE9UQXlNamN4TlRNME1EQmFGdzB5TkRBeQpNall4TlRNME1EQmFNQlV4RXpBUkJnTlZCQU1UQ210MVltVnlibVYwWlhNd2dnRWlNQTBHQ1NxR1NJYjNEUUVCCkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDeWkwUUdPY3YyYlRmM044T0xOOTdSd3NnSDZRQXI4d1NwQU9ydHRCSmcKRm5mblUyVDFSSGd4bTdxZDE5MFdMOERDaHYwZFpmNzZkNmVTUTRacmpqeUFyVHp1ZmI0RHRQd2crVldxN1h2RgpCTnluKzJoZjRTeVNrd2Q2azdYTGhVVFJ4MDQ4SWJCeUM0ditGRXZtb0xBd3JjMGQwRzE0ZWM2c25EKzdqTzdlCmt5a1EvTmdBT0w3UDZrRHM5ejYrYk9mZ0YwbkdOK2JtZVdRcUplalIwdCtPeVFEQ3g1L0ZNdFVmRVZSNVFYODAKYWVlZmdwM0pGWmI2ZkF3OUtoTHRkUlYzRlAwdHo2aFMrZTRTZzBtd0FBT3FpalpzVjg3a1A1R1l6anRjZkExMgpsRFlsL25iMUd0VnZ2a1FENDlWblY3bURubDZtRzNMQ01OQ05INldsWk52M0FnTUJBQUdqUWpCQU1BNEdBMVVkCkR3RUIvd1FFQXdJQkJqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01CMEdBMVVkRGdRV0JCU0ZBM0x2Sk0yMWQ4cXMKWlZWQ2U2UnJUVDl3aVRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQW5zL0VKM3lLc2p0SVNvdGVRNzE0cjJVbQpCTVB5VVlUVGRSSEQ4TFpNZDNSeWt2c2FjRjJsMnk4OE56NndKY0F1b1VqMWg4YUJEUDVvWFZ0Tm1GVDlqeWJTClRYclJ2V2krYWVZZGI1NTZuRUE1L2E5NGUrY2IrQ2szcXkvMXhnUW9TNDU3QVpRT0Rpc0RaTkJZV2tBRnMyTGMKdWNwY0F0WEp0SXRoVm03RmpvQUhZY3NyWTA0eUFpWUVKTEQwMlRqVURYZzRpR09HTWtWSGRtaGF3QkRCRjNBagplc2ZjcUZ3amk2SnlBS0ZSQUNQb3d5a1FPTkZ3VVNvbTg5dVlFU1NDSkZ2TkNrOU1KbWpKMlB6RFV0NkN5cFI0CmVwRmRkMWZYTHd1d243ZnZQTW1KcUQzSHRMYWxYMUFabVBrK0JJOGV6ZkFpVmNWcW5USlFNWGxZUHBZZTlBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= @@ -63,7 +63,7 @@ apiVersion: v1 kind: Secret metadata: name: kube-apiserver - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore type: Opaque data: kube-apiserver.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVEakNDQXZhZ0F3SUJBZ0lVSjQzbHJublpXSmYyTEV2OWMxVDVoaDAzb1Fvd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZURVRNQkVHQTFVRUF4TUthM1ZpWlhKdVpYUmxjekFlRncweE9UQTBNekF4TVRVNU1EQmFGdzB5T1RBMApNamN4TVRVNU1EQmFNQnN4R1RBWEJnTlZCQU1URUhONWMzUmxiVHBoY0dselpYSjJaWEl3Z2dFaU1BMEdDU3FHClNJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUURFTjVKUUhsODJKeTdWeDcvT3VDOWl6dFhPZG1CSUV6Q0sKY3VCa0RxbVZhY3ZLUi90VjhZellCb2lVZCtVR0dKWG5TSFVjT1ArR200a0tPQkxOMDNpV3Fkakx2amU5d0tiZgp2ZVoxKzhaSFdDdUtTWXEzZE5BdXdKSzZqdnl3dDErOHhZUS9uYzVGYWkvR0owVE92NFE5YUlZd0VUV0t5eVFyCm4vU2NyY1M5NXJQTFhueFQvbVlxZCttczhBc0RQOUNDRWZoQnRCejN4ZmJ3RHk4L1BkSnp5dC9mOVVqR3JhcjMKbU1sbzdUL1V1VTcxYk1TUU1tNWtHZXNFSXU1RkozL2t5NTlpamdScW5FQ0JUbkZSeENzamh3anRQSkYveHFZYwpQdlJIT3RweU5nTUVsRmZqRlh5ZkU3Z1UzaGJScGRRRmtYeEpGT2V6eGdyMzQrRTN0SkFCQWdNQkFBR2pnZ0ZPCk1JSUJTakFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUhBd0V3REFZRFZSMFQKQVFIL0JBSXdBREFkQmdOVkhRNEVGZ1FVMktlb2lxUEJQN29aRmEyVFJqcTFzU25xdkkwd0h3WURWUjBqQkJndwpGb0FVaFFOeTd5VE50WGZLckdWVlFudWthMDAvY0lrd2dkUUdBMVVkRVFTQnpEQ0J5WUlPYTNWaVpTMWhjR2x6ClpYSjJaWEtDSG10MVltVXRZWEJwYzJWeWRtVnlMbk5vYjI5MExTMW1iMjh0TFdKaGNvSWlhM1ZpWlMxaGNHbHoKWlhKMlpYSXVjMmh2YjNRdExXWnZieTB0WW1GeUxuTjJZNElLYTNWaVpYSnVaWFJsYzRJU2EzVmlaWEp1WlhSbApjeTVrWldaaGRXeDBnaFpyZFdKbGNtNWxkR1Z6TG1SbFptRjFiSFF1YzNaamdpUnJkV0psY201bGRHVnpMbVJsClptRjFiSFF1YzNaakxtTnNkWE4wWlhJdWJHOWpZV3lDQ1d4dlkyRnNhRzl6ZEljRWZ3QUFBWWNFWkVBQUFUQU4KQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBcENGSmkxaWx2SDZEc1VuSmxRTDhOcEttN0dXejJoSWlPd2hqQzZHeQp0TjVhWGNDdXkyc0RvRFB2R1dHd3NEZjhHL1JyTGIwNEhJU0JUbUhTUGJvNHZQSnQvcXBacU10bGtLOWFOQ3NlCmtEU3E5UTM5a0hFSmtNcmgrYnpJMUtVa1gycEZoZ0g0bG5qZzA5TVc1KzdMTVBJRXdSVFpjanc5WjJuM0QxTVYKeUIveFpTR1h3V0JSbVg4cjdJcEVmYzNQK0Rmc015MUdEN2c5S2p0cVRIUkg5Tml3cUhoSFpOMkZYZ2w1S2JWYQpjcmwrQmxjemZtbUNubEFOMmpONU85YzV1dHhLRDVOVEdVS1R2b2J0Rkt0VE55dUV0THk2WUZBd2ZGSEx3aEZaCkdURGxJdWpPNVlyK2g0bHpqQ1ZHSCtZdWZSYzRSbVRXMHNadTZseVRiRjRGdnc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== @@ -73,7 +73,7 @@ apiVersion: v1 kind: Secret metadata: name: gardener - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore type: Opaque data: ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrakNDQWVLZ0F3SUJBZ0lVVHAzWHZocldPVk04WkdlODZZb1hNVi9VSjdBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZURVRNQkVHQTFVRUF4TUthM1ZpWlhKdVpYUmxjekFlRncweE9UQXlNamN4TlRNME1EQmFGdzB5TkRBeQpNall4TlRNME1EQmFNQlV4RXpBUkJnTlZCQU1UQ210MVltVnlibVYwWlhNd2dnRWlNQTBHQ1NxR1NJYjNEUUVCCkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDeWkwUUdPY3YyYlRmM044T0xOOTdSd3NnSDZRQXI4d1NwQU9ydHRCSmcKRm5mblUyVDFSSGd4bTdxZDE5MFdMOERDaHYwZFpmNzZkNmVTUTRacmpqeUFyVHp1ZmI0RHRQd2crVldxN1h2RgpCTnluKzJoZjRTeVNrd2Q2azdYTGhVVFJ4MDQ4SWJCeUM0ditGRXZtb0xBd3JjMGQwRzE0ZWM2c25EKzdqTzdlCmt5a1EvTmdBT0w3UDZrRHM5ejYrYk9mZ0YwbkdOK2JtZVdRcUplalIwdCtPeVFEQ3g1L0ZNdFVmRVZSNVFYODAKYWVlZmdwM0pGWmI2ZkF3OUtoTHRkUlYzRlAwdHo2aFMrZTRTZzBtd0FBT3FpalpzVjg3a1A1R1l6anRjZkExMgpsRFlsL25iMUd0VnZ2a1FENDlWblY3bURubDZtRzNMQ01OQ05INldsWk52M0FnTUJBQUdqUWpCQU1BNEdBMVVkCkR3RUIvd1FFQXdJQkJqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01CMEdBMVVkRGdRV0JCU0ZBM0x2Sk0yMWQ4cXMKWlZWQ2U2UnJUVDl3aVRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQW5zL0VKM3lLc2p0SVNvdGVRNzE0cjJVbQpCTVB5VVlUVGRSSEQ4TFpNZDNSeWt2c2FjRjJsMnk4OE56NndKY0F1b1VqMWg4YUJEUDVvWFZ0Tm1GVDlqeWJTClRYclJ2V2krYWVZZGI1NTZuRUE1L2E5NGUrY2IrQ2szcXkvMXhnUW9TNDU3QVpRT0Rpc0RaTkJZV2tBRnMyTGMKdWNwY0F0WEp0SXRoVm03RmpvQUhZY3NyWTA0eUFpWUVKTEQwMlRqVURYZzRpR09HTWtWSGRtaGF3QkRCRjNBagplc2ZjcUZ3amk2SnlBS0ZSQUNQb3d5a1FPTkZ3VVNvbTg5dVlFU1NDSkZ2TkNrOU1KbWpKMlB6RFV0NkN5cFI0CmVwRmRkMWZYTHd1d243ZnZQTW1KcUQzSHRMYWxYMUFabVBrK0JJOGV6ZkFpVmNWcW5USlFNWGxZUHBZZTlBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= @@ -85,7 +85,7 @@ apiVersion: v1 kind: Service metadata: name: kube-apiserver - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore spec: ports: - name: kube-apiserver @@ -104,7 +104,7 @@ metadata: app: kubernetes role: apiserver name: kube-apiserver - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore spec: progressDeadlineSeconds: 600 replicas: 1 diff --git a/example/30-backupbucket.yaml b/example/30-backupbucket.yaml index 9da1db90..6a532043 100644 --- a/example/30-backupbucket.yaml +++ b/example/30-backupbucket.yaml @@ -12,9 +12,9 @@ data: apiVersion: extensions.gardener.cloud/v1alpha1 kind: BackupBucket metadata: - name: cloud--onmetal--fg2d6 + name: cloud--ironcore--fg2d6 spec: - type: onmetal + type: ironcore region: europe-central secretRef: name: backupprovider diff --git a/example/30-backupentry.yaml b/example/30-backupentry.yaml index 16c3b788..3b6e8141 100644 --- a/example/30-backupentry.yaml +++ b/example/30-backupentry.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: backupprovider - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore type: Opaque data: # namespace: base64(namespace) @@ -12,11 +12,11 @@ data: apiVersion: extensions.gardener.cloud/v1alpha1 kind: BackupEntry metadata: - name: shoot--foobar--onmetal--sd34f + name: shoot--foobar--ironcore--sd34f spec: - type: onmetal + type: ironcore region: europe-central - bucketName: cloud--onmetal--fg2d6 + bucketName: cloud--ironcore--fg2d6 secretRef: name: backupprovider namespace: garden \ No newline at end of file diff --git a/example/30-bastion.yaml b/example/30-bastion.yaml index 8f2beadf..b7eecba7 100644 --- a/example/30-bastion.yaml +++ b/example/30-bastion.yaml @@ -3,7 +3,7 @@ apiVersion: extensions.gardener.cloud/v1alpha1 kind: Bastion metadata: name: bastion - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore spec: ingress: - ipBlock: @@ -11,4 +11,4 @@ spec: - ipBlock: cidr: "110.112.119.110/32" userData: IyEvY= #base64(userData) - type: onmetal + type: ironcore diff --git a/example/30-controlplane.yaml b/example/30-controlplane.yaml index 8cd5aa6d..d1760237 100644 --- a/example/30-controlplane.yaml +++ b/example/30-controlplane.yaml @@ -2,17 +2,17 @@ apiVersion: v1 kind: Namespace metadata: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore labels: -# backup.gardener.cloud/provider: onmetal -# seed.gardener.cloud/provider: onmetal - shoot.gardener.cloud/provider: onmetal +# backup.gardener.cloud/provider: ironcore +# seed.gardener.cloud/provider: ironcore + shoot.gardener.cloud/provider: ironcore --- apiVersion: v1 kind: Secret metadata: name: cloudprovider - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore type: Opaque data: namespace: my-namespace @@ -22,7 +22,7 @@ data: apiVersion: extensions.gardener.cloud/v1alpha1 kind: Cluster metadata: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore spec: cloudProfile: apiVersion: core.gardener.cloud/v1beta1 @@ -48,21 +48,21 @@ apiVersion: extensions.gardener.cloud/v1alpha1 kind: ControlPlane metadata: name: control-plane - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore spec: - type: onmetal + type: ironcore region: my-region secretRef: name: cloudprovider - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore providerConfig: - apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 + apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: ControlPlaneConfig cloudControllerManager: featureGates: CustomResourceValidation: true infrastructureProviderStatus: - apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 + apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: InfrastructureStatus #networkRef: # (optional) # name: my-network diff --git a/example/30-infrastructure.yaml b/example/30-infrastructure.yaml index f19206c6..4aa6e728 100644 --- a/example/30-infrastructure.yaml +++ b/example/30-infrastructure.yaml @@ -2,13 +2,13 @@ apiVersion: v1 kind: Namespace metadata: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore --- apiVersion: v1 kind: Secret metadata: - name: core-onmetal - namespace: shoot--foobar--onmetal + name: core-ironcore + namespace: shoot--foobar--ironcore type: Opaque data: namespace: my-namespace @@ -18,7 +18,7 @@ data: apiVersion: extensions.gardener.cloud/v1alpha1 kind: Cluster metadata: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore spec: cloudProfile: apiVersion: core.gardener.cloud/v1beta1 @@ -40,16 +40,16 @@ spec: apiVersion: extensions.gardener.cloud/v1alpha1 kind: Infrastructure metadata: - name: onmetal-infra - namespace: shoot--foobar--onmetal + name: ironcore-infra + namespace: shoot--foobar--ironcore spec: - type: onmetal + type: ironcore region: my-region secretRef: - namespace: shoot--foobar--onmetal - name: core-onmetal + namespace: shoot--foobar--ironcore + name: core-ironcore providerConfig: - apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 + apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: InfrastructureConfig #networkRef: # (optional) # name: my-network diff --git a/example/30-worker.yaml b/example/30-worker.yaml index 5c5e2921..ca9a3336 100644 --- a/example/30-worker.yaml +++ b/example/30-worker.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: cloudprovider - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore type: Opaque data: namespace: my-namespace @@ -13,14 +13,14 @@ data: apiVersion: extensions.gardener.cloud/v1alpha1 kind: Cluster metadata: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore spec: cloudProfile: apiVersion: core.gardener.cloud/v1beta1 kind: CloudProfile spec: providerConfig: - apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 + apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: CloudProfileConfig machineImages: - name: gardenlinux @@ -47,26 +47,26 @@ apiVersion: extensions.gardener.cloud/v1alpha1 kind: Worker metadata: name: worker - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore annotations: gardener.cloud/operation: reconcile spec: - type: onmetal + type: ironcore region: my-region secretRef: name: cloudprovider - namespace: shoot--foobar--onmetal + namespace: shoot--foobar--ironcore infrastructureProviderStatus: - apiVersion: onmetal.provider.extensions.gardener.cloud/v1alpha1 + apiVersion: ironcore.provider.extensions.gardener.cloud/v1alpha1 kind: InfrastructureStatus networkRef: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore uid: 1234 natGatewayRef: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore uid: 1234 prefixRef: - name: shoot--foobar--onmetal + name: shoot--foobar--ironcore uid: 1234 pools: - name: cpu-worker diff --git a/example/40-validatingwebhookconfiguration.yaml b/example/40-validatingwebhookconfiguration.yaml index 87a52d23..5fbd29b8 100644 --- a/example/40-validatingwebhookconfiguration.yaml +++ b/example/40-validatingwebhookconfiguration.yaml @@ -1,9 +1,9 @@ apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - name: gardener-extension-admission-onmetal + name: gardener-extension-admission-ironcore webhooks: -- name: validation.onmetal.provider.extensions.gardener.cloud +- name: validation.ironcore.provider.extensions.gardener.cloud rules: - apiGroups: - "core.gardener.cloud" @@ -21,7 +21,7 @@ webhooks: # Please make sure you are running `gardener@v1.42` or later before enabling this object selector. objectSelector: matchLabels: - provider.extensions.gardener.cloud/onmetal: "true" + provider.extensions.gardener.cloud/ironcore: "true" namespaceSelector: {} sideEffects: None admissionReviewVersions: @@ -30,7 +30,7 @@ webhooks: clientConfig: url: "https://localhost:9443/webhooks/validate" caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrakNDQWVLZ0F3SUJBZ0lRWVlvRklZU2UyQjdMZEk1ODdnNHJDVEFOQmdrcWhraUc5dzBCQVFzRkFEQVgKTVJVd0V3WURWUVFERXd4bllYSmtaVzVsY2kxa1pYWXdIaGNOTWpFd01USXhNVEF6TVRFd1doY05NekV3TVRJeApNVEF6TVRFd1dqQVhNUlV3RXdZRFZRUURFd3huWVhKa1pXNWxjaTFrWlhZd2dnRWlNQTBHQ1NxR1NJYjNEUUVCCkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDLy9IcEZEN3Z4clRmREp3Y3JMNW0zdUtVajVvMWw0NEtGRHFxQWg2L1AKblJQUlN3ZHR5M2YvYkQ1TVRXOUplOWsvajYrWHZwUmc3LzFLbmRkaGpObDdGUjVSejdacDF0TkVEZkJqd2pLVwpJeGRHYnRCaUcwZ1c0aDZ1aEFwcTk5aDk1NWtMQkhTVW1XUFRRZFNtQ0lEY1lnSmd6OGZXdFRQTmxVSUtaajVCCkUxSGsrazgxZjhnTGZsaXpuRkNFeUNHNHRuWm1XbXpVUXljdXdoQnpFSCt5N1QyZEgwN0VBM3V3SmFwZG5WTGMKSlhsVEUzQm1QY3RXNCs3dGM4eUNKd3BuUjlMdE51MTVtaUtWNVNKaHlTaTUzdmo5MUlFQXVOa0wrMDZMbmlOSAp4RVVnRlljUlZPOTZPcjZGSW9EYlFvZGlQbU1OWDJHaHd6bzhpMFFvNHNFakFnTUJBQUdqUWpCQU1BNEdBMVVkCkR3RUIvd1FFQXdJQnBqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01CMEdBMVVkRGdRV0JCUUJxTWdPKzJ1RG1KWHIKdUJwQ3lqaW9NbDZMTFRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWZRZXZldzFLOXJaWStwNmlmVGhXWm9SWQo5Y3RldzdTdjlCak4vdzZrazRML1V2ZHdML0NZWkZJUWR0Tm5uSjcrMXdxT093L1NEdi9HZ2ZTUlVhTlZkbEVFCmx1S003VGhTbGl1SFVJTS9IblpLdUFxQVpFUU5LQ0RDSnFDYkplS1BGYnJKcFZqMU1Xblc2YzV5L3dTMHJxOUsKRXludVJTQnMvOVEvOVg1NVBaZjRFZnhQN29UVGY4L2pIRnJ0ODdBT2ZqUGUzYlMxV1FGdHh3NVZyWm13TC9CbgpTNXlEcUpPTDNsR0xUeG9vOGhHNS9ucDZ0NkFXOXVoM2FxQ3FsZ051MmEwUndJSTBicmVFb3NZZmhlL0NXbkxBCmxhcVNKc0kydHBjeW4zMEFQbzlpRU9JVjYwc2VET3p6VGxyMm5oa2NURFBYZ2drWktCWWFncGlrTUZobGRBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= -- name: secrets.validation.onmetal.provider.extensions.gardener.cloud +- name: secrets.validation.ironcore.provider.extensions.gardener.cloud rules: - apiGroups: - "" @@ -43,7 +43,7 @@ webhooks: failurePolicy: Fail objectSelector: matchLabels: - provider.shoot.gardener.cloud/onmetal: "true" + provider.shoot.gardener.cloud/ironcore: "true" namespaceSelector: {} sideEffects: None admissionReviewVersions: @@ -52,7 +52,7 @@ webhooks: clientConfig: service: namespace: garden - name: gardener-extension-admission-onmetal + name: gardener-extension-admission-ironcore path: /webhooks/validate/secrets port: 9443 caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrakNDQWVLZ0F3SUJBZ0lRWVlvRklZU2UyQjdMZEk1ODdnNHJDVEFOQmdrcWhraUc5dzBCQVFzRkFEQVgKTVJVd0V3WURWUVFERXd4bllYSmtaVzVsY2kxa1pYWXdIaGNOTWpFd01USXhNVEF6TVRFd1doY05NekV3TVRJeApNVEF6TVRFd1dqQVhNUlV3RXdZRFZRUURFd3huWVhKa1pXNWxjaTFrWlhZd2dnRWlNQTBHQ1NxR1NJYjNEUUVCCkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDLy9IcEZEN3Z4clRmREp3Y3JMNW0zdUtVajVvMWw0NEtGRHFxQWg2L1AKblJQUlN3ZHR5M2YvYkQ1TVRXOUplOWsvajYrWHZwUmc3LzFLbmRkaGpObDdGUjVSejdacDF0TkVEZkJqd2pLVwpJeGRHYnRCaUcwZ1c0aDZ1aEFwcTk5aDk1NWtMQkhTVW1XUFRRZFNtQ0lEY1lnSmd6OGZXdFRQTmxVSUtaajVCCkUxSGsrazgxZjhnTGZsaXpuRkNFeUNHNHRuWm1XbXpVUXljdXdoQnpFSCt5N1QyZEgwN0VBM3V3SmFwZG5WTGMKSlhsVEUzQm1QY3RXNCs3dGM4eUNKd3BuUjlMdE51MTVtaUtWNVNKaHlTaTUzdmo5MUlFQXVOa0wrMDZMbmlOSAp4RVVnRlljUlZPOTZPcjZGSW9EYlFvZGlQbU1OWDJHaHd6bzhpMFFvNHNFakFnTUJBQUdqUWpCQU1BNEdBMVVkCkR3RUIvd1FFQXdJQnBqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01CMEdBMVVkRGdRV0JCUUJxTWdPKzJ1RG1KWHIKdUJwQ3lqaW9NbDZMTFRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWZRZXZldzFLOXJaWStwNmlmVGhXWm9SWQo5Y3RldzdTdjlCak4vdzZrazRML1V2ZHdML0NZWkZJUWR0Tm5uSjcrMXdxT093L1NEdi9HZ2ZTUlVhTlZkbEVFCmx1S003VGhTbGl1SFVJTS9IblpLdUFxQVpFUU5LQ0RDSnFDYkplS1BGYnJKcFZqMU1Xblc2YzV5L3dTMHJxOUsKRXludVJTQnMvOVEvOVg1NVBaZjRFZnhQN29UVGY4L2pIRnJ0ODdBT2ZqUGUzYlMxV1FGdHh3NVZyWm13TC9CbgpTNXlEcUpPTDNsR0xUeG9vOGhHNS9ucDZ0NkFXOXVoM2FxQ3FsZ051MmEwUndJSTBicmVFb3NZZmhlL0NXbkxBCmxhcVNKc0kydHBjeW4zMEFQbzlpRU9JVjYwc2VET3p6VGxyMm5oa2NURFBYZ2drWktCWWFncGlrTUZobGRBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= diff --git a/example/admission-onmetal-certs/tls.crt b/example/admission-ironcore-certs/tls.crt similarity index 100% rename from example/admission-onmetal-certs/tls.crt rename to example/admission-ironcore-certs/tls.crt diff --git a/example/admission-onmetal-certs/tls.key b/example/admission-ironcore-certs/tls.key similarity index 100% rename from example/admission-onmetal-certs/tls.key rename to example/admission-ironcore-certs/tls.key diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index 89700fb6..76996ade 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -2,10 +2,10 @@ apiVersion: core.gardener.cloud/v1beta1 kind: ControllerDeployment metadata: - name: provider-onmetal + name: provider-ironcore type: helm providerConfig: - chart: H4sIAAAAAAAAA+09a3PbtrL9rF+BYU6nSW9IPSzLOTzTuVdxnNTT2NbYbjKdttcDkZDEmiJZPuyoSf/72QVAEnxIFBXXPe0Rpp2IAHaxeOxisbuA5zS0mcdCnX2ImRc5vqcHoX/n2JDle0sWU7f7xWemHqSjw0P+L6Tyv/x3/2DYHxwORiPM749Gw/4X5PBzG94mJVFMQ0K+CH0/3lSvqfwvmuZbzP/xgoaxsaJLd7c2cIJHw+Ha+R8MB8X5H/QOR8MvSO9hu1qf/svnnwbOOxbivJvkrt+hQZB/9oyB0evYLLJCJ4h53ph8y9wlsXBFkJkfknjByBu5hohcMGQiVxDJFlXHo0tmki1WW+eu1P6fPUJ/77QN/9u+Zcz93dto4P/+UX9Ukv9HRyAS9vz/CKnbJcd+sAqd+SImg95gQC68M87ENIkXfhh1ul34j7x1LFgezCaJh4yNbD8OqAX/yJLnRAoOAkxLnmIFTRZpz/6FKFZ+QpZ0RTw/JknEAIcTkZnjMhATFgti4njE8peB61DPYuTeiRe8HYnFQBw/SBz+NKZQnQJAAF8ztSKhsSSap0UcB2a3e39/b1BOseGH864r6kbdt6fHJ+dXJzqKGgH1veeyKCIh+zVxQujxdEVALAIAnQKtLr0nIPfoPGRQFvtI9X3oxI43f04ifxbf05AhGtuJ4tCZJnFh0FIaoetqBRg26hFtfEVOrzTycnx1evUckbw/vf724vtr8n58eTk+vz49uSIXl+T44vzV6fXpxTl8vSbj8x/Id6fnr54TBkPGpW4QYg+ATAeHk9l87K4YK5CQiu8oYJYzcyzomjdP6JyRuQ9C2IMekYCFSyfCaY2AQBvRuM7SiWnMsyr9MjpQZe6bc5QpNAbkC6JbRDOMLvy3oNZtNy3SLd+LQ991QdKEbI6DwbEaAFIWQcQg/3hq0ZgIPO9OLq+g98/kJ/tAoZusuw4hai7kJbSdBC8T65bFZopWZJ4A2ErJi/hel34fC6wTGB2WZZ56sxDqhYkVJ2Ge/d4Pb1mYfmo4GGQCbeCgij2TebiKIlIYoyQIfLmfykwcexxWyw9DZsUk7xopdK0TqNh32Cu3kf8xg+EFQqMdTwKt9f9Bb3RwtNf/HyO1m/+bBXNBJERGHLQ4CzTt//1hef4P+rBc9vv/I6SPH3Vis5njwXaNOrpG9N9/72yjpyMk82xev6OicemUuRFstoFxy1YCIf9IprCrMFhHhuN3sbECjjUo7qibSKo+foTN1nITO6PVIBJwAyFV2DKBiMUka2rI9nlL1V44Hiwf0FY4uHHJXEZhEzwH4mopy0hzliC0BWWEYIkzIwsaTUIo/0C0aEEHhyMTmn2HzUNTWN+I6ZxkEEHoePGMaF9G//dlVK4ZssCPnNgPV5tQQB9ZHUJzZ4TQWaXf8PPPXt/7tDm1k/+ghsyc+ZIGOp/8O1BNfKgH2iKqwGyNjajJ/jMcHRTl/0EPVIC9/H+MJGVPgaff8Wm9SGdVSL6CmejW8WwTNWNYDWc06OA6sWlMTZADwtJTL6vrl40EikCXrRGkPFuIGCGWzRphjug/QSas5ZgMsXZKDm8xuimuUZN8QiQbe11E93cVabvyv+vP53BI2coq3MD/B1hW1P8O+4P+nv8fIz0UY8v1oIsVUuRoscYU/kWzTLbeIiNdg4bl+oktF1kiTrgmkZgzhp45bgyLU9HDEAA5GtH++Pr07fXJ5c8dIhPXxUopoGHEwqzKGY2tRamKgv5rTpZqrlhSDwRG+LVkEH1thayJ79jqpkwJdCwrn3CKqiTA9EA+yKRJkeRLxrNvXsGgpHnXYcI6f9ggLKm1ANV10zBsqPLfMRDriypC9e80Ilbk6HboAClKz3PmiJz/6M4ufduZrbbubFYRhKTtoIhSKmL3+IHxZoloWETwePT/OfxPcJ4MfzKgyz+h2EIjNkjfn4yn60SIbvzP/97g/02y5lPtLFTBI+dZ1oWxbZdHg9zcpOL4Zpm4MWhCHvXiG8e+uSF+gLZJP/xXgnPwFxviDcyZDtLTZkn2qQWPP9RA/5H7/476X6togCb9bzA8Ktv/hkd7//+jpIfS/7KV8Yce5kQr2REO2UjXdf6v2hG5cI10JRuKsilRlHTOuz51gwXtc1TZIEgGP1YV0k7pxCzxWa4D1EJND46RKLF4H4HiUr4pZQK10OWJbUDx9SpgER+szOmoNeA3qgjQp5jCa0301cFLkvkwp7ktqVIg25GjAmZ0/Bq0HRWAaNcuAmTtTZMwilu2yGHatSlAikYFbJ7Flp2ujwikP2wqZraFWC6NovOUBUtNIKQhQYysZt4xAEfftxOvmqFlxZS+6lLn1afccyoqkdj/AV2sG+pl7Dwq9bu+iRmj6Fd9g5tO2gs1z1zfagG0ZbNT4foV/J62W8hM54NbjExSM5iF6sKylM+DVB6ON81lEUEZIsd157vJsg2qEsCWI5J7zcvDUi4xMy7ieZsJKwMbJai/s83tPym10/9sFrj+agkc1UYB3Kz/9QdHh6Oy/ochYXv97xGSqjbRIIi6mRL4KpvrrbXALXU/7glVnQ5zzw8ZHOX9JLRSgU89z5dhRkKwhGl5WXcT4CbRYjj4a8VNtY2SiXFQ2FTI7hwckG8d3BNXbzHeySQ9XsLDwKKCSJOZx37ixaLRCDqNvgRBNz+mvt2OjpFEgOE9bL6SHQcl1PHm3wcwBZlCsKQfvvfoHXVcjCcqEFQsUjefD1dJOK9U5pmiWsrpknJl2rnOWp4STFs6kDI9ZMGs2yhZKq6E9NBd6xsqLLWn3EVN/mFcSzqNl7C4JjReEG0r36T2jI+2cK8DFSplJWVsDbEbjz87ELsVWTC+FCjL5ozFoWNFhoglu7JCYGJvrgKBCIdKC5bwIIUIa+QMUl9J8LVWE8aQQzzB+AWauDGRJOCABT52k8du5uF3wAvOkq1pCoPdZFPFHk0wCk5tsDInqgcBk8fiez+8RU9USSrEfkqFnhkPQcS5rn/P7O3gbVjn7SCCZAqyQJd1WkOHzh0GRm4FvlYcAiIA06MFbFgRd5PkA6DHVqAPhwc55gaB9CId+lQ4itl0fGCplaLiZWpEtIpAiOj/7PXSgww07FhsbFkoIM837x6c6TKbXdqe3rTpiCR1crWWDLOpVpskrjvxYa6KByIR0hJkhQVh4C+XwIX52tNJd5s4qby6rgu9V6i6OohelBtWEoYw1HrI8MNxWfRNUWGWTBUZKrSRQ16tPCtSKc1bYhjZumtDHLipHSHIdAzj/qYLJ75u/SRJgddVDDhlNNh6gEG27elVoZsIXjDqxgsu2ds3pABv0U4YT+Ewqmcq0TcbrGF1gICb3esgXYGFYH+MkDx7E20CzuBwpxLsSkCVW3EKAcztR6II37wa+UF0l5UYpeahTfiFCqgLszk2lKsqazvAQS5SiHEGUMZ9z2O625Mu4Joov2dTENS3KR+1XCslaClrddxgVbJkNXnSlrXkZtuED/0ajehYWIfNdiJUUBRXSWGwZHFuZ0V7zS+gTRDtubYOl2y7DtF7WbQGS0lRLaochbZkkT6FTVCnto2XKb4x16ormzTIXOKsxybK6wjJthd5J07tdLbry7INXc2qih8u7B6qlcw4kzambCLOhEMrPwHWE+byTQyrRvrSWtZS9yBN1gws8+7UnVgoCG9Pxq9OLm9O3p4c4+2Ym/Px2cnVZHx8ktUkhPsOX4M+aiqZGFXCXPuSzYq5Mh+VdjM7DhkZk+56CErpPT0bvzl5B8ReXN5cvDu5fH95el2h1SRdfrlDiWHr1ga1bRou17mD6YiiSehPmdpHvB31hsXFbge8v12xMH8rFnHdvXH1Yopgn8Refnt9PVEKHM+JHeq+Yi5dyc3JJP1eViNk1HZa04pQq0ch9bCjNhBVV2EqRIVgVNBlmu2kTNk2EpWfomLf8l2TXB9PygbbsGg+ScdSZtYZzHOIT8ST+n6/V+OXwCSMx2eow9d02UqjvtK0xIqCbZq1ws9lo3VBpXXEVFhJqYdr6MJz4UiAB+X17ERnM1wZK1NZCfYYzprjSgHJ3EKvkhCObVew0OwEzTmnXP+Q2ScfmJWo7kHRPX4guypYk5ReoV3pRFz1K5pkUvBbtlp7rSG7+FCCIlnsAYgnr1LIJVKlKWxsi+sTKkDsB77rz1ffIY1a8VLFwo9ivkgKno7KcbC0eKzUaa1St7XPOk3SwHHm2wA3HKRiqdXK3G5dtqe3aZ1voH2tG6Wd/R/WOShbYcJfA5gm9pxt4whoiv8/rLz/cDga7O9/P0qSC3sek6doxqszaj8j/fIVgIBbR3JfwcS3X2Xr4iVfFw/tNNjNll9jJo+SaWNfP9uG/5dxXbbj/3BKrfYPwTTw/7A3Kvv/BsPh/v7PoyQMn1I5m8+wePrB+U3cMb99wXflPDrMhTFj4aXvsjZM3oZ9w8TF/V7HqK43oZ8EfPPX118a6BR0XayqGkujak4Xpj1O1AI0dzqsJketaom+yw/F7FiTo8IVzWW1eUWKuNmr+KFWEMalwu+8GFSDqRwFFMRck3Qi8eMeJRn/FWS/Eu5ZrI72OhdDdbCFFcDOcotEaF9rVeSW74dwzlOXWBUv3wdK2CxQ07naU+nVZ7aR5vNtR5SVRaEOlfGTbw4YDMjHuCpCM1ts/WysG3BN4/+gH17OfDpFa9lSANjykY7C2xBqhcBRWEcpUBxK68Yn25yj0mcXDjvUdX5L1yGopp5ktYjBLMUZTwgtW9aSHkPxlQeUVL67kUVdJtFxi2WkflDhUCqwJbAeq2Sg3Q36J/LzGpWiX/yp+AFKbv6jK24nwBJPYv4shzyqW2pMqGwTmvSX6ejxm95OXipHmmtOzlYcIkO/jIgGnO1qZwchm1HByvFxODfNM+CIQQ1yoddpdTGzm5GLgUJ1sIxSDmH5wFBAWWDonEUU5laFliq2FD4SHzYwJTLVZ21oL8WK+MP2NWhCGhnTQdxAYScLRVZ23AZ6QLv9BWQT3zwF8FXBAfswyvifrbXs00Oldvq/lL0tjwBN77+MRuX7vwf9o/35/1FS7f0PKTIe/ghfiSDbJqBlFvpL9MK6to5BMtzoTr768aOW2sM1U7s+nmjPNSzTzO3s6r///FU7CnhQDWO2LsKpdFg2uJvpMpKmQFiZjqLD8HmZ8ja0ZAOtpyYK2ahio4C2SybVgu8KWhVItVajAHu5zje2rOXcXQ2j4GBcZK5lbhfl+YhhnTG/zSK30tNJwcazXVim4u/Rq96lLZzsRQeONITzZdTKI/SQ/L+T/Je697bbQJP996B3WJL/w8ODffz3o6RN8j9VGf9USy6eRbgDr0jUtX/LgOQZdSO2V0d3Ty35X1wS4zfMtlcCm/j/aHhQ5v/B/v2Xx0nS/8N+rYbuoLKTXaElWvqoadkXlF4cLJ+qr0Q+DxKuFyEtLjG2kRht7o4IowGsdN3x7kCHsXVhU8jUDq7dveMO6JMPAfVEn3l8AB8a/MbA8obuKHWRROHRlsYG4a9tQFCBQDQBDWGEYhkqLRScABTUyN7aAdWO/+8CusPfAWg6/x0clfkfHwDd8/9jpFJgA06wuFZil9hcq9oQgdc1yezvpPFw4tvjzHi4/esB0OyWykOqzdfQnTK5GrpfzBPCQAnDErbYPLAkKxL3FL76+qtOGlyxdLyxOOmp8RpWkKy5L16lyMhRGABXf2e8GawQSLNkSz9c7USCAN2FCglZfvUzPctkUZR1dwsxv3K/sCnyBSoIsaxOo8ipCE8kXa1s5PX+Uo75R0rbyH8R9LX7H4Bp8v8PjsrxP/3ewV7/e5QkLk1xSZk+8GuS+cIKUb6nC2C7a04xnZuE6wnI0YFyw+p0du7HExAoyOwdNd7GJP1OOUaH58ibqoe9LxEg9SqRj6A7BXw/kbtUFqtZJ+mrMpvL68PeslMUn6PhmdMoZDTc2bRORzHmmeRF70WvkwcW84x+p6NceUBEauhBtgmp10JEWLFy72pDLTXIYEM15a7S5lrCU50qytWrQyY5wFDCYrjCxl5EeShrbQ0RsbChwtrLOemJv1O9PGKSH3/ulK6C8LyS4TFD8YTksZv4d0dAOceLrDy0HnULD84/sJ0yY27g9Vab3XVxbeNVW+bdOSGufHRAP6mLBsXniZ6kr8+a+FMJXF3zhJuoRYgg9FJlSCdeJFM4GCwznhRIKmwoUWzi5s2QnIvxAXL9xYt/Hh0OZ1qR+Bbvn7Xqzw54N3VyB3R5zw9GfTqwWann+QN7rTqmvLxXAt9E/3ooQeZdz+gbByCNCoZis5NduBXSaDg8kFnprYN+b3DYg8X/BHJjXMwR/7sjUqg9F8s9Su+UT1eE+zzyC9wAmUpAbA3wCEmcXQlPYXlhJqjTW+pSXnesjN76F7Lq3seSf4UHK3V/iXwv0+azt6pqa/BXpPryQrJ84qnPRVr+4FLpuSWrerNZGAz0GZVRCeqTSoPDN05u4s+NAkUfzBxv5qV3uWssAO+pE7/2w9cOUAgdj6Acb48U3j3CDbD2SSJ5+VkTMfPVd4ZkQeXRIJ6/7i2fyks+mmCJV0LKpn/3rWiZPcZwDkVUpwNoirgPeZrEZrO7YaK1mo7i2hOFKdNmj7vt1fd92qd92qfPSv8Gmx5ZDwB4AAA= + chart: H4sIAAAAAAAAA+09a3PbtrL9rF+BYU6nSW9IPW3n8EznXsd2Uk9jR2O7yXTaXg9EQhJrimT5sKMm/e9nFwBJ8CGRdFz3tEeYtJYA7GLx2MVidwEtaGgzj4U6+xAzL3J8Tw9C/9axIcsJfc/yQ9b/4vPSANLB3h7/C6n8l38ejifD0d5ofx/zhweD0egLsveZ7bZKSRTTkJAvQt+Pt9VrKv+LpkWb+T9a0jA21nTl3qsNnOD9yWTj/I+grDD/o8HB5OALMnjgvtam//L5p4HzjoU47ya5HfZoEORfB8bIGPRsFlmhE8Q875B8y9wVsXBBkLkfknjJyGu5hki6YMhULiGSraqeR1fMJG2WW++2RMGfPUZ/59SK/23fMhb+vdto4P/hwWi/zP/D0WTH/4+R+n1y5Afr0FksYzKCbZecwqwfIRPTJF76YdTr9+EfeeNYsD6YTRIPGRv5/jCgFvyRJc+JlBwEeJY8xQqaLNKe/QtRrP2ErOiaeH5MkogBDicic8dlICYsFsTE8YjlrwLXoZ7FyJ0TL3k7EouBOH6QOPxZTKE6BYAAvs3VioTGkmielnEcmP3+3d2dQTnFhh8u+q6oG/XfnB6dnF+e6ChpBNT3nsuiiITs18QJocezNQG5CAB0BrS69I6A4KOLkEFZ7CPVd6ETO97iOYn8eXxHQYYBGtuJ4tCZJXFh0FIaoetqBRg26hHt8JKcXmrk5eHl6eVzRPL+9Orbt99fkfeHFxeH51enJ5fk7QU5ent+fHp1+vYcvr0ih+c/kO9Oz4+fEwZDxqVuEGIPgEwHh5PZfOwuGSuQkMrvKGCWM3cs6Jq3SOiCkYUPMtiDHpGAhSsnwmmNgEAb0bjOyolpzLMq/TJ6UGXhmwsUKjQG5EuiW0QzjD78W1Lrpp8W6ZbvxaHvuiBqQrbAweBYDQCpyCBikH88tWhMBKJ3JxeX0P1n8iv7QKGfrL8JI6ou5CU0ngQvE+uGxWaGV+SeANxazYz4fpdlHAnEUxghlueeevMQaoaJFSehkv/eD29YmH3XcEzIFBrCsRV7J/NwMUWkMFRJEPhyX5WZOAU4uoAmZFZM8g6SQgd7gYq9w47ZSv7HDEYXKIzudxLorP+PhrAF7PT/x0gd5/96yVwQCZERB+3PAk37/3AyLM3/eDze6f+Pkj5+1InN5o4HuzWq6BrRf/+910pNR1Dm2Rygp+Jx6Yy5EWy2gXHD1gIj/5LMYFdhsI4Mx+9jawUcG1DcUjeRZH38CJut5SZ2RqxBJOAWQqqwZQIRi0k21JDt85aqvXA8WD+grXBw44K5jMImeA7E1VKWkeasQFoLygjBEmdOljSahlD+gWjRko729k1o9h02D01hfSOmC5JBBKHjxXOifRn935dRuWbIAj9yYj9cb0MBfWR1CM17I4TOKv2Gj3/2At+lramj/Af9Y+4sVjTQ+eTfgk7ihzpqi6gCs3obUZP9Z7I/Lsr/MZ4Ad/L/MZIUPQWWfsdn9W06qULwFcxEN45nm6gUw2I4o0FvxWJq05iaIAaEoadeVNevGgkUgQ5bI0d5tpAwQiqbNbIc0X+CTFjLMZlg7ZQc3mJ0XVyiJvmESLb2uoju7yrR7s3/rr9YwOmkjVW4gf/H+3tl++/eeDDe8f9jpIdibLkcdLFAihwt1pjCv2iVydZbZKRr0LBcP7HlGkvEydYkEnPG0HPHjWFxKmoYAiBHI9ofX52+uTq5+LlHZOKqWCkFNIxYmFU5o7G1LFVR0H/NyVKtFSvqgcAIv04ZRN9YI2vjO7a+LpMCPcvKp5ykKg0wP5APQmlapPmC8ezrYxiVNO8qTFjvDxuFFbWWoLpuHYctdf47RmJzUVWs/p2GxIoc3Q4dIEXpusIfkfMf3duVbzvzdeveZhVBUNoOiimlInaPnxmvV4iGRQRPSP+fw/8ER8rwJwO6/BOKLrRjgwT+yXi6SYroxv/87zX+1yhvPtXOQw185DzLOnFo2+XxINfXqVC+XiVuDPqQR7342rGvr4kfoGXSD/+V4Cz8xQZ5C4Omo/S0hTj71IXRH2qo/4j9/776X5dogCb9b7RXtv+O93f+/8dJD6X/ZQvjDz3MiVayIxyyj67r/K/akXThGulSNhRtU+IoKZ23Q+oGSzrkuLJRkKx9pGqkvdKRWeKzXAfIhZoenCNRWPFOAsmlfFMKA2qhyxPbgOKrdcAiPlqZ01FrwG9UEaBPMYXXmuirg5ck83FOcztSpUB2I0cFzOj4Neg6KgDRrV0EyNqbJWEUd2yRw3RrU4AUrQrYPIstO10fEYh92E7MbO+wXBpF5ykPlppASEOCGFnNvGMAjr5vJ143Q8uKKX3Vpc6rz7jfVFQisf8Deli31Mv4eb/U7/om5oyiS/U1bjppL9Q8c3OrBdCOzc6E31fwe9puITOdD24yMknNYBaqC9NSPg9SbTjaNpdFBGWIHNet7yarLqhKAC1HJHeal4elXGJmXMTzthNWBjZKUH9no9t/UOqo/9kscP31CjiqgwK4Xf8bjg72y/rfZHAw2ul/j5FUtYkGQdTPlMDjbKpba4EtdT/uCFWdDgsPVhkc4/0ktFJ5Tz3Pl1FGQq6EaXlZdRPgJtFiOPRrxT21i5KJYVDYVMhuHRyQbx3cEtdvMNzJJANewqPAooJEk5lHfuLFotEIOo2+BEE3P6C+aUfHvkSAYT1ssZYdBx3U8RbfBzAFmT6woh++9+gtdVyMIyoQVCxS954Pl0m4qFTmmaJayuiScmXaucpanhJMLR1ImRqyZNZNlKxUT2J63K51DhXW2lPuoib/MK4kocZLWF1TGi+J1so3qT3jwy3c60CGSlpJGdtA7dbzzz2IbUUWDDAFyrJJY3HoWJEhgsgurRC42FuoQCDDodKSJTxIIcIaOYfUVxKMrdWEMeQQTzB+gSZuTCQJOGCBj93ksZt59B0wg7NiG5rCKDfZVLFHUwx/UxuszInqQsDksfjOD2/QE1USC7GfUqFnlkOQca7r3zG7HbwNC70bRJDMQBjosk5n6NC5xcDIVuAb5SEgAjA9WsKOFXE/ST4AemwF+mQyzjE3SKQX6dCn0lHMpuMDS60VFS/TI6J1BFJE/+dgkB5koGHHYoeWhRLyfPv2wZkuM9el7elNu45IUidXa8kwm2q1aeK6Ux/mqnggEiEtQVZYEAb+agVcmK89nfRbBUrl9XVdKL5C19VB+KLgsJIwhLHWQ4ZfHJdF3xQ1ZslVkaFCGznk5dqzIpXUvCWGga33bYgDN7UjJJmOcdzf9OHI16+fJSnx+ooJp4wGWw8wwrY7vSp0E8FLRt14yUV794YU4BbthPEMTqN6phR9s8UeVgcIuNmdDuIVeIgCSyN59jbaBJzB4U4l2KWAKrfiFIKXu49EEb55NfKT6H1WYpTah7bhF0qgLgzm2FCurGzsAAd5m0IcZgBl3Hc8nLs76QKuifI7NgNJfZPyUce1UoKWwlbHHVYlS1aTR21ZS+62TfjQpdGIjoV12GwnQg1F8ZIUBksW54ZWNNj8AuoE0Z5rm3DJtusQvZdFG7CUVNWizlFoSxbpM9gFdWrbeJviG3OjvrJNhcwlzmZsoryOkGx/kXfi1E5n274s29LVrKr44MLuoZrJjDNpZMom4kz4svIzYD1hLt/EsGqkr6xVLXUP0mTNwDLvVt2KhYbw5uTw+OTi+uTNyRFej7k+Pzw7uZweHp1kNQnhfsNXoJCaSibGlTDXvmDzYq7MR63dzA5ERsak9z0GpfSenh2+PnkHxL69uH777uTi/cXpVYVWk/T5tQ4liq1fG9a2bbhc5xamI4qmoT9jah/xetRrFhe7HfD+9sXC/K1YxJX3xtWLKYJ9Env57dXVVClwPCd2qHvMXLqWm5NJhoOsRsio7XSmFaHWj0LqXk9tIKquwlSICsGooMtU22mZsjYSlR+jYt/yXZNcHU3LFtuwaEBJx1Jm1lnMc4hPxJMK/3BQ45jAJKzHZ6jE13TZSuO+0rTCioJtmrXCz2WjTWGldcRUWEmph2vorefCmQBPypvZic7nuDLWprIS7EM4bB5WCkjmFzpOQji3XcJCsxM06Jxy/UNmn3xgVqL6B0X3+InssmBPUnqFlqUTcdevaJRJwW/YeuO9huzmQwmKZFEHIJ68SiGXSJWmsLEW9ydUgNgPfNdfrL9DGrXirYqlH8V8kRRcHZXzYGnxWKnbWqWutdc6TdLCcebbADcZpWKp08psty6709u0zrfQvsGP0tH+D8scdK0w4c8BzBJ7wVo4Apri//cmo5L9H/6/i/99lCSX9SImT9GKV2fUfkaG5SsAATeO5L6CqW8fZ8viJV8WD+00uJ8tv8ZMHiWzxr5+tg3/L+O57Mj/4YxanR+CaeD/yWD/oMT/o/3Rzv/3KAnDp1TO5hMsXn5wfhN3y29e8D05jw5zYcxYeOG7rAuTd2HfMHFxt9cxqut16CcB3/r1zZcGegVNF6uqptKomtOHaY8TtQCNnQ6ryVGrWqLv8otidKzJUeGKxrLavCJF3OhV/KJWEKalwue8GBSDmRwFFMRcj3Qi8eEOJRn/FGSfEu5ZrI72Jg9DdbCFDcDOcotEaF9rVeSW74dwylOXWBUv3wdK2CxQ0rnSU+nVZ7aR5vNtR5RVRKEOtfE73x0wGJAPclWGZqbY+unYNOKaxv+gI15OfTpHG/lSANjykY7CoxBqhcBReEcpUBxKmwYo252j0tc+nHWo6/yWLkTQTD3JaxGDaYozphBKtqwlPYbiWx5QUvnejyzqMomOGywj9QsVDqUCXwLvsUoGmt2gfyI/r1Ep+sWfiQ+g5OYf+uJqAqzxJObvcciTuqXGhMo2oUl/lY4ev+nt5KVypLnq5LRiERn6ZUQ04HxXOzsI2YwKVo6Pw7ltngFHDHqQC71Oq4uZ3Y5cDBTqg2WUcgjLB4YCygJH5yyicLcqtVS5pfCR+GIDUyJTfdaO9lKsiD9sY4MmpI0xHcQtFPayUGRly22gB9TbX0A28d1TAF8WHLAPo43/2WrLLj1Q6qj/S9nb7QjQ9P7L/n75/u94vLc7/z9Kqr3/ISXGwx/hKxFkbeJZ5qG/Qh+sa+sYI8NN7uSrHz9qqTVcM7Wro6n2XMMyzWxnVf/956+6UcBjahizdRFNpcOywc1Ml4E0BcLKdBTdhc/LlHehJRtoPTVRyEYVGwW0XTKoFjxX0KpAqnUaBdjKdb6vZS3nzmoYBQfjInMls12U5yOGdcb8MovcSU+nBRtPu7BMxdujV31LLVzsRfeNNIPzZdTJH/SQ/H8/+S9175bbQJP9dzzYK8d/Hwx39/8eJW2T/6nG+KdacvEowt13RaKu/BsGJM+pG7GdNnr/1JX/xSUxfsOstRLYxP8Hlfe/J5Od/+dxkvT/sF+rgTuo7GQ3aImWvWZadgalFwfLp+pLkc+DhOtlSIdLjF1ERpfLI8JooMOyd7xbUGJsXdgUMr2Dq3fvuP/55ENAPdFnHh7Axwa/Y2B5Q3eUukiicGhLY4Nw1zYgqEAgmoCGMEKxDJUWGk4AGmpkt/VAdeT/24B2/x2ApvPf+GBc9v9MDvZ3/P8YqRTWgPMrbpXYJS7XqiZEYHVN8vo7aTuc+vZhZjts/3oANNtSeUi1+Rq6Ux5XI/eLeUIWKEFYwhSbh5VkReKawldff9VLQytWjncoTnpqtIYVJBuui1cpMnIUBsDVXxlvBiuE0azYyg/X9yJBgN6HCglZfvQzPctkMZR1dwsxv3K/sCnuBSoIqaxOo8ipyE4kXa1s5PX+Uo75R0qt5L+I+br3D8A0+f/Hk/LvPwxHw93vPzxKEnemuKRM3/c1yWJphfxx49TrabPbtledYrowCVcWkK8D5ZrV6fzcj6cgVpDle2rUjUmGvXKkDs+R91X3Bl8iQOpaIh9BgQr4riL3qixes07eVyU3l9p7g1WvKET3J2dOo6jRcH/Tej3FpGeSF4MXg14eXMwzhr2ecu0BEakBCNlWpF4NEaHFyt2rLbXUUIMt1ZT7SttrCXd1qi1Xrw+ZZIzhhMWgha29iPJw1toaIm5hS4WNF3TSc3+veoHEJD/+3CtdB+F5JfNjhuIJyeM38cdHQEPH26w8vB41DA9OQbCpMmNh4B1X5ARc23jflnm3uPCF8/pJXUQoPlL0JH2D1sSPSvDqhjfcRC1CBKEXKls68TKZwelgVeRMganKjBJRI2c3wHOOxhfJ9Rcv/nmwN5lrxY50eQqte+fug72xx/dBmg/DeH9IRzYrDUP+9F73TqoP85WQNPZlC6wg+XZgDI0xiKyCTdnsZVdzhciaTMYyK72eMByM9gbAIU8gN8YVH/GfJpGS77ngiSi9fT5bE+4eya96A2QqJrE1wCPEdXZ5PIXlhZk0T++zS6HeszJ669/SqntJS/5eD1bq/xL5Xqb4Z69a1dbg700N5dVl+RjUkMu9/Gmm0sNMVvUOtDAt6HMq4xfUx5dGe6+d3BuQmw+K7poFXuFLb33X2AreUyd+5YevHKAQOh5BOV4zKbyQhLtk7eNF8pq0JoLrqy8SyYLK80I8f9OrP5U3fzTBHsdCFKc/EVc04h5h4Iciz9MBNEWEiDx4YrPZJTLRWk1Hce2JwpSD83fgdqr+Lu3SLu1SJf0bSfedpQB4AAA= values: image: tag: v0.2.0 @@ -13,21 +13,21 @@ providerConfig: apiVersion: core.gardener.cloud/v1beta1 kind: ControllerRegistration metadata: - name: provider-onmetal + name: provider-ironcore spec: deployment: deploymentRefs: - - name: provider-onmetal + - name: provider-ironcore resources: - kind: BackupBucket - type: onmetal + type: ironcore - kind: BackupEntry - type: onmetal + type: ironcore - kind: Bastion - type: onmetal + type: ironcore - kind: ControlPlane - type: onmetal + type: ironcore - kind: Infrastructure - type: onmetal + type: ironcore - kind: Worker - type: onmetal + type: ironcore diff --git a/example/doc.go b/example/doc.go index 5a9879f0..1dd8dfcd 100644 --- a/example/doc.go +++ b/example/doc.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/go.mod b/go.mod index fd215ade..dc7dfb98 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/onmetal/gardener-extension-provider-onmetal +module github.com/ironcore-dev/gardener-extension-provider-ironcore go 1.21 @@ -13,8 +13,8 @@ require ( github.com/gardener/machine-controller-manager v0.50.1 github.com/go-logr/logr v1.3.0 github.com/imdario/mergo v0.3.16 - github.com/onmetal/controller-utils v0.8.3 - github.com/onmetal/onmetal-api v0.1.2-0.20230928225058-754dd4d16010 + github.com/ironcore-dev/controller-utils v0.9.0 + github.com/ironcore-dev/ironcore v0.1.2-0.20231120144059-30dd02e88870 github.com/onsi/ginkgo/v2 v2.13.2 github.com/onsi/gomega v1.30.0 github.com/spf13/cobra v1.8.0 @@ -69,7 +69,7 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/huandu/xstrings v1.3.2 // indirect @@ -100,7 +100,7 @@ require ( golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.10.0 // indirect + golang.org/x/oauth2 v0.11.0 // indirect golang.org/x/sys v0.14.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect @@ -108,8 +108,8 @@ require ( golang.org/x/tools v0.14.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect @@ -118,10 +118,10 @@ require ( istio.io/client-go v1.17.1 // indirect k8s.io/apiserver v0.28.4 // indirect k8s.io/helm v2.16.1+incompatible // indirect - k8s.io/klog/v2 v2.100.1 // indirect - k8s.io/kube-aggregator v0.28.2 // indirect + k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/kube-aggregator v0.28.4 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect k8s.io/metrics v0.28.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/go.sum b/go.sum index 8f0a0c83..1553aa41 100644 --- a/go.sum +++ b/go.sum @@ -180,8 +180,9 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= @@ -201,6 +202,10 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/ironcore-dev/controller-utils v0.9.0 h1:q8Ljk6UIS6WB0J/k/hVV13umHUn/Bfr2+PxdZls1C8U= +github.com/ironcore-dev/controller-utils v0.9.0/go.mod h1:06mPYdYCdjGHVz/msCG/MyDjPdOufRkUd4GaTqkzZwg= +github.com/ironcore-dev/ironcore v0.1.2-0.20231120144059-30dd02e88870 h1:yAFYucF/zthz9zdgHLbaQ5q9Ee0hFfbNHtxflm/lU5o= +github.com/ironcore-dev/ironcore v0.1.2-0.20231120144059-30dd02e88870/go.mod h1:+rMMEH846ihqB+P55EX/NIvKQs9QDjcIurhRoR3jorU= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -263,10 +268,6 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onmetal/controller-utils v0.8.3 h1:yIS9Gz+QO1oQEpXlfZFbnPz2fttpk4ZYBz0f80ovd48= -github.com/onmetal/controller-utils v0.8.3/go.mod h1:8Inx1jd9R85PjFoQLMNDCQnYI5wMYcmnhK8DD2V4l50= -github.com/onmetal/onmetal-api v0.1.2-0.20230928225058-754dd4d16010 h1:7nbhE1adc+HDDOpUyrD5gMqI/cfBuH60bcv3l/+V+v4= -github.com/onmetal/onmetal-api v0.1.2-0.20230928225058-754dd4d16010/go.mod h1:hPpc+xzka053PkPZVk22qmVrAxJ4POlUn8WmdYEF4TE= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -450,8 +451,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= -golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= -golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= +golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= +golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -572,10 +573,10 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -664,10 +665,11 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-aggregator v0.28.2 h1:tCjAfB1p/v18yD2NpegNQRuahzyA/szFfcRARnpjDeo= -k8s.io/kube-aggregator v0.28.2/go.mod h1:g4hZVjC4KhJtZHV2pyiRBiU6AdBA/sAjh9Y9GJC/SbU= +k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= +k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/kube-aggregator v0.28.4 h1:VIGTKc3cDaJ44bvj988MTapJyRPbWXXcCvlp7HVLq5Q= +k8s.io/kube-aggregator v0.28.4/go.mod h1:SHehggsYGjVaE1CZTfhukAPpdhs7bflJiddLrabbQNY= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= @@ -690,8 +692,8 @@ sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= -sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/hack/api-reference/api.json b/hack/api-reference/api.json index 3f5c7742..cd6cb5ae 100644 --- a/hack/api-reference/api.json +++ b/hack/api-reference/api.json @@ -12,8 +12,8 @@ "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}" }, { - "typeMatchPrefix": "^github\\.com/onmetal/onmetal-api/api/common/v1alpha1\\.LocalUIDReference", - "docsURLTemplate": "https://github.com/onmetal/onmetal-api/blob/main/docs/api-reference/common.md#localuidreference" + "typeMatchPrefix": "^github\\.com/ironcore-dev/ironcore/api/common/v1alpha1\\.LocalUIDReference", + "docsURLTemplate": "https://github.com/ironcore-dev/ironcore/blob/main/docs/api-reference/common.md#localuidreference" } ], "typeDisplayNamePrefixOverrides": { diff --git a/hack/api-reference/api.md b/hack/api-reference/api.md index af10d498..54d7771a 100644 --- a/hack/api-reference/api.md +++ b/hack/api-reference/api.md @@ -1,22 +1,22 @@

Packages:

-

onmetal.provider.extensions.gardener.cloud/v1alpha1

+

ironcore.provider.extensions.gardener.cloud/v1alpha1

-

Package v1alpha1 contains the onmetal provider API resources.

+

Package v1alpha1 contains the ironcore provider API resources.

Resource Types: -

CloudProfileConfig +

CloudProfileConfig

CloudProfileConfig contains provider-specific configuration that is embedded into Gardener’s CloudProfile @@ -36,7 +36,7 @@ resource.

string -onmetal.provider.extensions.gardener.cloud/v1alpha1 +ironcore.provider.extensions.gardener.cloud/v1alpha1 @@ -51,7 +51,7 @@ string machineImages
- + []MachineImages @@ -65,7 +65,7 @@ logical names and versions to provider-specific identifiers.

regionConfigs
- + []RegionConfig @@ -78,7 +78,7 @@ logical names and versions to provider-specific identifiers.

storageClasses
- + StorageClasses @@ -90,7 +90,7 @@ StorageClasses -

ControlPlaneConfig +

ControlPlaneConfig

ControlPlaneConfig contains configuration settings for the control plane.

@@ -109,7 +109,7 @@ StorageClasses string -onmetal.provider.extensions.gardener.cloud/v1alpha1 +ironcore.provider.extensions.gardener.cloud/v1alpha1 @@ -124,7 +124,7 @@ string cloudControllerManager
- + CloudControllerManagerConfig @@ -136,7 +136,7 @@ CloudControllerManagerConfig -

InfrastructureConfig +

InfrastructureConfig

InfrastructureConfig infrastructure configuration resource

@@ -155,7 +155,7 @@ CloudControllerManagerConfig string -onmetal.provider.extensions.gardener.cloud/v1alpha1 +ironcore.provider.extensions.gardener.cloud/v1alpha1 @@ -181,11 +181,11 @@ Kubernetes core/v1.LocalObjectReference -

CloudControllerManagerConfig +

CloudControllerManagerConfig

(Appears on: -ControlPlaneConfig) +ControlPlaneConfig)

CloudControllerManagerConfig contains configuration settings for the cloud-controller-manager.

@@ -212,7 +212,7 @@ map[string]bool -

InfrastructureStatus +

InfrastructureStatus

InfrastructureStatus contains information about created infrastructure resources.

@@ -229,8 +229,8 @@ map[string]bool networkRef
- -github.com/onmetal/onmetal-api/api/common/v1alpha1.LocalUIDReference + +github.com/ironcore-dev/ironcore/api/common/v1alpha1.LocalUIDReference @@ -242,8 +242,8 @@ github.com/onmetal/onmetal-api/api/common/v1alpha1.LocalUIDReference natGatewayRef
- -github.com/onmetal/onmetal-api/api/common/v1alpha1.LocalUIDReference + +github.com/ironcore-dev/ironcore/api/common/v1alpha1.LocalUIDReference @@ -255,8 +255,8 @@ github.com/onmetal/onmetal-api/api/common/v1alpha1.LocalUIDReference prefixRef
- -github.com/onmetal/onmetal-api/api/common/v1alpha1.LocalUIDReference + +github.com/ironcore-dev/ironcore/api/common/v1alpha1.LocalUIDReference @@ -266,14 +266,14 @@ github.com/onmetal/onmetal-api/api/common/v1alpha1.LocalUIDReference -

MachineImage +

MachineImage

(Appears on: -WorkerStatus) +WorkerStatus)

-

MachineImage is a mapping from logical names and versions to onmetal-specific identifiers.

+

MachineImage is a mapping from logical names and versions to ironcore-specific identifiers.

@@ -330,11 +330,11 @@ string
-

MachineImageVersion +

MachineImageVersion

(Appears on: -MachineImages) +MachineImages)

MachineImageVersion contains a version and a provider-specific identifier.

@@ -383,11 +383,11 @@ string -

MachineImages +

MachineImages

(Appears on: -CloudProfileConfig) +CloudProfileConfig)

MachineImages is a mapping from logical names and versions to provider-specific identifiers.

@@ -415,7 +415,7 @@ string versions
- + []MachineImageVersion @@ -426,11 +426,11 @@ string -

RegionConfig +

RegionConfig

(Appears on: -CloudProfileConfig) +CloudProfileConfig)

RegionConfig is the definition of a region.

@@ -478,11 +478,11 @@ string -

StorageClass +

StorageClass

(Appears on: -StorageClasses) +StorageClasses)

StorageClass is a definition of a storageClass

@@ -519,11 +519,11 @@ string -

StorageClasses +

StorageClasses

(Appears on: -CloudProfileConfig) +CloudProfileConfig)

StorageClasses is a definition of a storageClasses

@@ -540,7 +540,7 @@ string default
- + StorageClass @@ -554,7 +554,7 @@ StorageClass additional
- + []StorageClass @@ -566,7 +566,7 @@ StorageClass -

WorkerStatus +

WorkerStatus

WorkerStatus contains information about created worker resources.

@@ -583,7 +583,7 @@ StorageClass machineImages
- + []MachineImage diff --git a/hack/api-reference/config.md b/hack/api-reference/config.md index 042a20b2..4f178abe 100644 --- a/hack/api-reference/config.md +++ b/hack/api-reference/config.md @@ -1,21 +1,21 @@

Packages:

-

onmetal.provider.extensions.config.gardener.cloud/v1alpha1

+

ironcore.provider.extensions.config.gardener.cloud/v1alpha1

-

Package v1alpha1 contains the onmetal provider configuration API resources.

+

Package v1alpha1 contains the ironcore provider configuration API resources.

Resource Types: -

ControllerConfiguration +

ControllerConfiguration

-

ControllerConfiguration defines the configuration for the onmetal provider.

+

ControllerConfiguration defines the configuration for the ironcore provider.

@@ -31,7 +31,7 @@ Resource Types: string @@ -61,7 +61,7 @@ settings for the proxy server to use when communicating with the apiserver.

-onmetal.provider.extensions.config.gardener.cloud/v1alpha1 +ironcore.provider.extensions.config.gardener.cloud/v1alpha1
etcd
- + ETCD @@ -102,7 +102,7 @@ Default: nil

 bastionConfig
- + BastionConfig @@ -116,7 +116,7 @@ BastionConfig 		backupBucketConfig
- + BackupBucketConfig @@ -127,11 +127,11 @@ BackupBucketConfig
-

BackupBucketConfig +

BackupBucketConfig

(Appears on: -ControllerConfiguration) +ControllerConfiguration)

BackupBucketConfig is config for Backup Bucket

@@ -152,16 +152,16 @@ string -

BucketClassName is the name of the onmetal BucketClass to use for the BackupBucket

+

BucketClassName is the name of the ironcore BucketClass to use for the BackupBucket

-

BastionConfig +

BastionConfig

(Appears on: -ControllerConfiguration) +ControllerConfiguration)

BastionConfig is the config for the Bastion

@@ -193,7 +193,7 @@ string -

MachineClassName is the name of the onmetal MachineClass to use for the Bastion host

+

MachineClassName is the name of the ironcore MachineClass to use for the Bastion host

@@ -204,16 +204,16 @@ string -

VolumeClassName is the name of the onmetal VolumeClass to use for the Bastion host root disk volume

+

VolumeClassName is the name of the ironcore VolumeClass to use for the Bastion host root disk volume

-

ETCD +

ETCD

(Appears on: -ControllerConfiguration) +ControllerConfiguration)

ETCD is an etcd configuration.

@@ -230,7 +230,7 @@ string storage
- + ETCDStorage @@ -243,7 +243,7 @@ ETCDStorage backup
- + ETCDBackup @@ -254,11 +254,11 @@ ETCDBackup -

ETCDBackup +

ETCDBackup

(Appears on: -ETCD) +ETCD)

ETCDBackup is an etcd backup configuration.

@@ -285,11 +285,11 @@ string -

ETCDStorage +

ETCDStorage

(Appears on: -ETCD) +ETCD)

ETCDStorage is an etcd storage configuration.

diff --git a/hack/api-reference/template/tools.go b/hack/api-reference/template/tools.go index ade632cc..321c2137 100644 --- a/hack/api-reference/template/tools.go +++ b/hack/api-reference/template/tools.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt index e5a66c44..285c20fb 100644 --- a/hack/boilerplate.go.txt +++ b/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 by the OnMetal authors. + * Copyright (c) 2021 by the IronCore authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hack/dev-setup-admission-onmetal.sh b/hack/dev-setup-admission-ironcore.sh similarity index 92% rename from hack/dev-setup-admission-onmetal.sh rename to hack/dev-setup-admission-ironcore.sh index ede9a52e..e55e5f1c 100755 --- a/hack/dev-setup-admission-onmetal.sh +++ b/hack/dev-setup-admission-ironcore.sh @@ -16,8 +16,8 @@ is_nodeless() { IP_ROUTE=$(ip route get 1) IP_ADDRESS=$(echo ${IP_ROUTE#*src} | awk '{print $1}') -ADMISSION_SERVICE_NAME="gardener-extension-admission-onmetal" -ADMISSION_ENDPOINT_NAME="gardener-extension-admission-onmetal" +ADMISSION_SERVICE_NAME="gardener-extension-admission-ironcore" +ADMISSION_ENDPOINT_NAME="gardener-extension-admission-ironcore" ADMISSION_EXTERNAL_NAME=gardener.localhost if [[ "$(uname -s)" == *"Darwin"* ]] || [[ "$(uname -s)" == "Linux" && "$(uname -r)" =~ "microsoft-standard" ]] ; then diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 2c4c04c8..a2162e5e 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -65,7 +65,7 @@ echo "Generating ${blue}deepcopy${normal}" "$DEEPCOPY_GEN" \ --output-base "$GOPATH/src" \ --go-header-file "$SCRIPT_DIR/boilerplate.go.txt" \ - --input-dirs "$(qualify-gvs "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis" "config:v1alpha1 onmetal:v1alpha1")" \ + --input-dirs "$(qualify-gvs "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis" "config:v1alpha1 ironcore:v1alpha1")" \ -O zz_generated.deepcopy echo "${bold}Internal types${normal}" @@ -74,20 +74,20 @@ echo "Generating ${blue}deepcopy${normal}" "$DEEPCOPY_GEN" \ --output-base "$GOPATH/src" \ --go-header-file "$SCRIPT_DIR/boilerplate.go.txt" \ - --input-dirs "$(qualify-gs "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis" "config onmetal")" \ + --input-dirs "$(qualify-gs "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis" "config ironcore")" \ -O zz_generated.deepcopy echo "Generating ${blue}defaulter${normal}" "$DEFAULTER_GEN" \ --output-base "$GOPATH/src" \ --go-header-file "$SCRIPT_DIR/boilerplate.go.txt" \ - --input-dirs "$(qualify-gvs "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis" "config:v1alpha1 onmetal:v1alpha1")" \ + --input-dirs "$(qualify-gvs "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis" "config:v1alpha1 ironcore:v1alpha1")" \ -O zz_generated.defaults echo "Generating ${blue}conversion${normal}" "$CONVERSION_GEN" \ --output-base "$GOPATH/src" \ --go-header-file "$SCRIPT_DIR/boilerplate.go.txt" \ - --input-dirs "$(qualify-gs "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis" "config onmetal")" \ - --input-dirs "$(qualify-gvs "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis" "config:v1alpha1 onmetal:v1alpha1")" \ + --input-dirs "$(qualify-gs "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis" "config ironcore")" \ + --input-dirs "$(qualify-gvs "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis" "config:v1alpha1 ironcore:v1alpha1")" \ -O zz_generated.conversion diff --git a/hack/update-github-templates.sh b/hack/update-github-templates.sh index b66ea88f..a5ed3965 100755 --- a/hack/update-github-templates.sh +++ b/hack/update-github-templates.sh @@ -12,6 +12,6 @@ for file in `find "$(dirname $0)"/../vendor/github.com/gardener/gardener/.github sed 's/to the Gardener project/for this extension/g' |\ sed 's/to Gardener/to this extension/g' |\ sed 's/- Gardener version:/- Gardener version (if relevant):\n- Extension version:/g' |\ - sed 's/\/kind [a-zA-Z]*/&\n\/platform onmetal/g' \ + sed 's/\/kind [a-zA-Z]*/&\n\/platform ironcore/g' \ > "$(dirname $0)/../.github/${file#*.github/}" done diff --git a/pkg/admission/cmd/options.go b/pkg/admission/cmd/options.go index 066ca5fd..0e29ef42 100644 --- a/pkg/admission/cmd/options.go +++ b/pkg/admission/cmd/options.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package cmd import ( webhookcmd "github.com/gardener/gardener/extensions/pkg/webhook/cmd" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/admission/validator" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/admission/validator" ) // GardenWebhookSwitchOptions are the webhookcmd.SwitchOptions for the admission webhooks. diff --git a/pkg/admission/decode.go b/pkg/admission/decode.go index e18fb41d..4f1a723d 100644 --- a/pkg/admission/decode.go +++ b/pkg/admission/decode.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,14 +16,13 @@ package admission import ( "github.com/gardener/gardener/extensions/pkg/util" + ironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" "k8s.io/apimachinery/pkg/runtime" - - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" ) // DecodeControlPlaneConfig decodes the `ControlPlaneConfig` from the given `RawExtension`. -func DecodeControlPlaneConfig(decoder runtime.Decoder, cp *runtime.RawExtension) (*onmetal.ControlPlaneConfig, error) { - controlPlaneConfig := &onmetal.ControlPlaneConfig{} +func DecodeControlPlaneConfig(decoder runtime.Decoder, cp *runtime.RawExtension) (*ironcore.ControlPlaneConfig, error) { + controlPlaneConfig := &ironcore.ControlPlaneConfig{} if err := util.Decode(decoder, cp.Raw, controlPlaneConfig); err != nil { return nil, err } @@ -32,8 +31,8 @@ func DecodeControlPlaneConfig(decoder runtime.Decoder, cp *runtime.RawExtension) } // DecodeInfrastructureConfig decodes the `InfrastructureConfig` from the given `RawExtension`. -func DecodeInfrastructureConfig(decoder runtime.Decoder, infra *runtime.RawExtension) (*onmetal.InfrastructureConfig, error) { - infraConfig := &onmetal.InfrastructureConfig{} +func DecodeInfrastructureConfig(decoder runtime.Decoder, infra *runtime.RawExtension) (*ironcore.InfrastructureConfig, error) { + infraConfig := &ironcore.InfrastructureConfig{} if err := util.Decode(decoder, infra.Raw, infraConfig); err != nil { return nil, err } diff --git a/pkg/admission/validator/secret.go b/pkg/admission/validator/secret.go index 236df735..03845406 100644 --- a/pkg/admission/validator/secret.go +++ b/pkg/admission/validator/secret.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/equality" "sigs.k8s.io/controller-runtime/pkg/client" - onmetalvalidation "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/validation" + ironcorevalidation "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/validation" ) type secret struct{} @@ -33,7 +33,7 @@ func NewSecretValidator() extensionswebhook.Validator { return &secret{} } -// Validate checks whether the given new secret contains a valid onmetal service account. +// Validate checks whether the given new secret contains a valid ironcore service account. func (s *secret) Validate(_ context.Context, newObj, oldObj client.Object) error { secret, ok := newObj.(*corev1.Secret) if !ok { @@ -51,5 +51,5 @@ func (s *secret) Validate(_ context.Context, newObj, oldObj client.Object) error } } - return onmetalvalidation.ValidateCloudProviderSecret(secret) + return ironcorevalidation.ValidateCloudProviderSecret(secret) } diff --git a/pkg/admission/validator/secretbinding.go b/pkg/admission/validator/secretbinding.go index 33fc3625..8505a649 100644 --- a/pkg/admission/validator/secretbinding.go +++ b/pkg/admission/validator/secretbinding.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/api/equality" "sigs.k8s.io/controller-runtime/pkg/client" - onmetalvalidation "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/validation" + ironcorevalidation "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/validation" ) type secretBinding struct { @@ -41,7 +41,7 @@ func NewSecretBindingValidator(mgr manager.Manager) extensionswebhook.Validator } } -// Validate checks whether the given SecretBinding refers to a Secret with a valid onmetal service account. +// Validate checks whether the given SecretBinding refers to a Secret with a valid ironcore service account. func (sb *secretBinding) Validate(ctx context.Context, newObj, oldObj client.Object) error { secretBinding, ok := newObj.(*core.SecretBinding) if !ok { @@ -70,5 +70,5 @@ func (sb *secretBinding) Validate(ctx context.Context, newObj, oldObj client.Obj return err } - return onmetalvalidation.ValidateCloudProviderSecret(secret) + return ironcorevalidation.ValidateCloudProviderSecret(secret) } diff --git a/pkg/admission/validator/secretbinding_test.go b/pkg/admission/validator/secretbinding_test.go index 5935e4c2..6d39e4e0 100644 --- a/pkg/admission/validator/secretbinding_test.go +++ b/pkg/admission/validator/secretbinding_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import ( "github.com/gardener/gardener/pkg/apis/core" mockclient "github.com/gardener/gardener/pkg/mock/controller-runtime/client" mockmanager "github.com/gardener/gardener/pkg/mock/controller-runtime/manager" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/admission/validator" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/admission/validator" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" diff --git a/pkg/admission/validator/shoot.go b/pkg/admission/validator/shoot.go index 3040ee37..cc26387d 100644 --- a/pkg/admission/validator/shoot.go +++ b/pkg/admission/validator/shoot.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import ( "github.com/gardener/gardener/pkg/apis/core" gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1" kutil "github.com/gardener/gardener/pkg/utils/kubernetes" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/admission" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - onmetalvalidation "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/validation" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/admission" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + ironcorevalidation "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/validation" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/validation/field" @@ -77,8 +77,8 @@ var ( type validationContext struct { shoot *core.Shoot - infrastructureConfig *apisonmetal.InfrastructureConfig - controlPlaneConfig *apisonmetal.ControlPlaneConfig + infrastructureConfig *apisironcore.InfrastructureConfig + controlPlaneConfig *apisironcore.ControlPlaneConfig cloudProfile *gardencorev1beta1.CloudProfile } @@ -87,10 +87,10 @@ func (s *shoot) validateContext(valContext *validationContext) field.ErrorList { allErrors = field.ErrorList{} ) - allErrors = append(allErrors, onmetalvalidation.ValidateNetworking(valContext.shoot.Spec.Networking, networkPath)...) - allErrors = append(allErrors, onmetalvalidation.ValidateInfrastructureConfig(valContext.infrastructureConfig, valContext.shoot.Spec.Networking.Nodes, valContext.shoot.Spec.Networking.Pods, valContext.shoot.Spec.Networking.Services, infrastructureConfigPath)...) - allErrors = append(allErrors, onmetalvalidation.ValidateWorkers(valContext.shoot.Spec.Provider.Workers, workersPath)...) - allErrors = append(allErrors, onmetalvalidation.ValidateControlPlaneConfig(valContext.controlPlaneConfig, valContext.shoot.Spec.Kubernetes.Version, controlPlaneConfigPath)...) + allErrors = append(allErrors, ironcorevalidation.ValidateNetworking(valContext.shoot.Spec.Networking, networkPath)...) + allErrors = append(allErrors, ironcorevalidation.ValidateInfrastructureConfig(valContext.infrastructureConfig, valContext.shoot.Spec.Networking.Nodes, valContext.shoot.Spec.Networking.Pods, valContext.shoot.Spec.Networking.Services, infrastructureConfigPath)...) + allErrors = append(allErrors, ironcorevalidation.ValidateWorkers(valContext.shoot.Spec.Provider.Workers, workersPath)...) + allErrors = append(allErrors, ironcorevalidation.ValidateControlPlaneConfig(valContext.controlPlaneConfig, valContext.shoot.Spec.Kubernetes.Version, controlPlaneConfigPath)...) return allErrors } @@ -122,14 +122,14 @@ func (s *shoot) validateUpdate(ctx context.Context, oldShoot, currentShoot *core ) if !reflect.DeepEqual(oldInfrastructureConfig, currentInfrastructureConfig) { - allErrors = append(allErrors, onmetalvalidation.ValidateInfrastructureConfigUpdate(oldInfrastructureConfig, currentInfrastructureConfig, infrastructureConfigPath)...) + allErrors = append(allErrors, ironcorevalidation.ValidateInfrastructureConfigUpdate(oldInfrastructureConfig, currentInfrastructureConfig, infrastructureConfigPath)...) } if !reflect.DeepEqual(oldControlPlaneConfig, currentControlPlaneConfig) { - allErrors = append(allErrors, onmetalvalidation.ValidateControlPlaneConfigUpdate(oldControlPlaneConfig, currentControlPlaneConfig, controlPlaneConfigPath)...) + allErrors = append(allErrors, ironcorevalidation.ValidateControlPlaneConfigUpdate(oldControlPlaneConfig, currentControlPlaneConfig, controlPlaneConfigPath)...) } - allErrors = append(allErrors, onmetalvalidation.ValidateWorkersUpdate(oldValContext.shoot.Spec.Provider.Workers, currentValContext.shoot.Spec.Provider.Workers, workersPath)...) + allErrors = append(allErrors, ironcorevalidation.ValidateWorkersUpdate(oldValContext.shoot.Spec.Provider.Workers, currentValContext.shoot.Spec.Provider.Workers, workersPath)...) allErrors = append(allErrors, s.validateContext(currentValContext)...) return allErrors.ToAggregate() @@ -138,7 +138,7 @@ func (s *shoot) validateUpdate(ctx context.Context, oldShoot, currentShoot *core func newValidationContext(ctx context.Context, decoder runtime.Decoder, c client.Client, shoot *core.Shoot) (*validationContext, error) { if shoot.Spec.Provider.InfrastructureConfig == nil { - return nil, field.Required(infrastructureConfigPath, "infrastructureConfig must be set for onmetal shoots") + return nil, field.Required(infrastructureConfigPath, "infrastructureConfig must be set for ironcore shoots") } infrastructureConfig, err := admission.DecodeInfrastructureConfig(decoder, shoot.Spec.Provider.InfrastructureConfig) if err != nil { @@ -146,7 +146,7 @@ func newValidationContext(ctx context.Context, decoder runtime.Decoder, c client } if shoot.Spec.Provider.ControlPlaneConfig == nil { - return nil, field.Required(controlPlaneConfigPath, "controlPlaneConfig must be set for onmetal shoots") + return nil, field.Required(controlPlaneConfigPath, "controlPlaneConfig must be set for ironcore shoots") } controlPlaneConfig, err := admission.DecodeControlPlaneConfig(decoder, shoot.Spec.Provider.ControlPlaneConfig) if err != nil { diff --git a/pkg/admission/validator/validator_suite_test.go b/pkg/admission/validator/validator_suite_test.go index b312e931..e23a2f11 100644 --- a/pkg/admission/validator/validator_suite_test.go +++ b/pkg/admission/validator/validator_suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/admission/validator/webhook.go b/pkg/admission/validator/webhook.go index a8efbe0b..5dd562ac 100644 --- a/pkg/admission/validator/webhook.go +++ b/pkg/admission/validator/webhook.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + ironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) const ( @@ -33,17 +33,17 @@ const ( SecretsValidatorName = "secrets." + Name ) -var logger = log.Log.WithName("onmetal-validator-webhook") +var logger = log.Log.WithName("ironcore-validator-webhook") // New creates a new validation webhook for `core.gardener.cloud` resources. func New(mgr manager.Manager) (*extensionswebhook.Webhook, error) { logger.Info("Setting up webhook", "name", Name) return extensionswebhook.New(mgr, extensionswebhook.Args{ - Provider: onmetal.Type, + Provider: ironcore.Type, Name: Name, Path: "/webhooks/validate", - Predicates: []predicate.Predicate{extensionspredicate.GardenCoreProviderType(onmetal.Type)}, + Predicates: []predicate.Predicate{extensionspredicate.GardenCoreProviderType(ironcore.Type)}, Validators: map[extensionswebhook.Validator][]extensionswebhook.Type{ NewShootValidator(mgr): {{Obj: &core.Shoot{}}}, NewSecretBindingValidator(mgr): {{Obj: &core.SecretBinding{}}}, @@ -56,7 +56,7 @@ func NewSecretsWebhook(mgr manager.Manager) (*extensionswebhook.Webhook, error) logger.Info("Setting up webhook", "name", SecretsValidatorName) return extensionswebhook.New(mgr, extensionswebhook.Args{ - Provider: onmetal.Type, + Provider: ironcore.Type, Name: SecretsValidatorName, Path: "/webhooks/validate/secrets", Validators: map[extensionswebhook.Validator][]extensionswebhook.Type{ diff --git a/pkg/apis/config/doc.go b/pkg/apis/config/doc.go index 00b15f3f..fb71cde3 100644 --- a/pkg/apis/config/doc.go +++ b/pkg/apis/config/doc.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,6 +13,6 @@ // limitations under the License. // +k8s:deepcopy-gen=package -// +groupName="onmetal.provider.extensions.config.gardener.cloud" +// +groupName="ironcore.provider.extensions.config.gardener.cloud" -package config // import "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" +package config // import "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" diff --git a/pkg/apis/config/install/install.go b/pkg/apis/config/install/install.go index 147a3193..3379fa54 100644 --- a/pkg/apis/config/install/install.go +++ b/pkg/apis/config/install/install.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config/v1alpha1" ) var ( diff --git a/pkg/apis/config/loader/loader.go b/pkg/apis/config/loader/loader.go index c54db5e8..ca4b5c7c 100644 --- a/pkg/apis/config/loader/loader.go +++ b/pkg/apis/config/loader/loader.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/versioning" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config/install" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config/install" ) var ( diff --git a/pkg/apis/config/register.go b/pkg/apis/config/register.go index 1b4b9c75..fb603cd3 100644 --- a/pkg/apis/config/register.go +++ b/pkg/apis/config/register.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( ) // GroupName is the group name use in this package -const GroupName = "onmetal.provider.extensions.config.gardener.cloud" +const GroupName = "ironcore.provider.extensions.config.gardener.cloud" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} diff --git a/pkg/apis/config/types.go b/pkg/apis/config/types.go index 7333f2ef..901499da 100644 --- a/pkg/apis/config/types.go +++ b/pkg/apis/config/types.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import ( // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// ControllerConfiguration defines the configuration for the onmetal provider. +// ControllerConfiguration defines the configuration for the ironcore provider. type ControllerConfiguration struct { metav1.TypeMeta @@ -70,14 +70,14 @@ type ETCDBackup struct { type BastionConfig struct { // Image is the URL pointing to an OCI registry containing the operating system image which should be used to boot the Bastion host Image string - // MachineClassName is the name of the onmetal MachineClass to use for the Bastion host + // MachineClassName is the name of the ironcore MachineClass to use for the Bastion host MachineClassName string - // VolumeClassName is the name of the onmetal VolumeClass to use for the Bastion host root disk volume + // VolumeClassName is the name of the ironcore VolumeClass to use for the Bastion host root disk volume VolumeClassName string } // BackupBucketConfig is config for Backup Bucket type BackupBucketConfig struct { - // BucketClassName is the name of the onmetal BucketClass to use for the BackupBucket + // BucketClassName is the name of the ironcore BucketClass to use for the BackupBucket BucketClassName string } diff --git a/pkg/apis/config/v1alpha1/defaults.go b/pkg/apis/config/v1alpha1/defaults.go index a966d984..f2570b91 100644 --- a/pkg/apis/config/v1alpha1/defaults.go +++ b/pkg/apis/config/v1alpha1/defaults.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/config/v1alpha1/doc.go b/pkg/apis/config/v1alpha1/doc.go index 7c02f6cd..292282b1 100644 --- a/pkg/apis/config/v1alpha1/doc.go +++ b/pkg/apis/config/v1alpha1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,10 +13,10 @@ // limitations under the License. // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config +// +k8s:conversion-gen=github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta -// Package v1alpha1 contains the onmetal provider configuration API resources. -// +groupName= onmetal.provider.extensions.config.gardener.cloud -package v1alpha1 // import "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config/v1alpha1" +// Package v1alpha1 contains the ironcore provider configuration API resources. +// +groupName= ironcore.provider.extensions.config.gardener.cloud +package v1alpha1 // import "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config/v1alpha1" diff --git a/pkg/apis/config/v1alpha1/register.go b/pkg/apis/config/v1alpha1/register.go index a240714b..b83a1ab5 100644 --- a/pkg/apis/config/v1alpha1/register.go +++ b/pkg/apis/config/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( ) // GroupName is the group name use in this package -const GroupName = "onmetal.provider.extensions.config.gardener.cloud" +const GroupName = "ironcore.provider.extensions.config.gardener.cloud" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/pkg/apis/config/v1alpha1/types.go b/pkg/apis/config/v1alpha1/types.go index 9b9099a0..59e8d979 100644 --- a/pkg/apis/config/v1alpha1/types.go +++ b/pkg/apis/config/v1alpha1/types.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import ( // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// ControllerConfiguration defines the configuration for the onmetal provider. +// ControllerConfiguration defines the configuration for the ironcore provider. type ControllerConfiguration struct { metav1.TypeMeta `json:",inline"` @@ -78,14 +78,14 @@ type ETCDBackup struct { type BastionConfig struct { // Image is the URL pointing to an OCI registry containing the operating system image which should be used to boot the Bastion host Image string `json:"image,omitempty"` - // MachineClassName is the name of the onmetal MachineClass to use for the Bastion host + // MachineClassName is the name of the ironcore MachineClass to use for the Bastion host MachineClassName string `json:"machineClassName,omitempty"` - // VolumeClassName is the name of the onmetal VolumeClass to use for the Bastion host root disk volume + // VolumeClassName is the name of the ironcore VolumeClass to use for the Bastion host root disk volume VolumeClassName string `json:"volumeClassName,omitempty"` } // BackupBucketConfig is config for Backup Bucket type BackupBucketConfig struct { - // BucketClassName is the name of the onmetal BucketClass to use for the BackupBucket + // BucketClassName is the name of the ironcore BucketClass to use for the BackupBucket BucketClassName string `json:"bucketClassName,omitempty"` } diff --git a/pkg/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/apis/config/v1alpha1/zz_generated.conversion.go index fb61b1fa..f8b5785d 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/config/v1alpha1/zz_generated.conversion.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* - * Copyright (c) 2021 by the OnMetal authors. + * Copyright (c) 2021 by the IronCore authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import ( apisconfig "github.com/gardener/gardener/extensions/pkg/apis/config" apisconfigv1alpha1 "github.com/gardener/gardener/extensions/pkg/apis/config/v1alpha1" - config "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" + config "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" resource "k8s.io/apimachinery/pkg/api/resource" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index 1b7b41e2..d0519ac6 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* - * Copyright (c) 2021 by the OnMetal authors. + * Copyright (c) 2021 by the IronCore authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pkg/apis/config/v1alpha1/zz_generated.defaults.go b/pkg/apis/config/v1alpha1/zz_generated.defaults.go index eed1d793..1e1afc5e 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.defaults.go +++ b/pkg/apis/config/v1alpha1/zz_generated.defaults.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* - * Copyright (c) 2021 by the OnMetal authors. + * Copyright (c) 2021 by the IronCore authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pkg/apis/config/zz_generated.deepcopy.go b/pkg/apis/config/zz_generated.deepcopy.go index a3d08e4b..6af4f77e 100644 --- a/pkg/apis/config/zz_generated.deepcopy.go +++ b/pkg/apis/config/zz_generated.deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* - * Copyright (c) 2021 by the OnMetal authors. + * Copyright (c) 2021 by the IronCore authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pkg/apis/onmetal/doc.go b/pkg/apis/ironcore/doc.go similarity index 75% rename from pkg/apis/onmetal/doc.go rename to pkg/apis/ironcore/doc.go index 82ded3fd..d258982f 100644 --- a/pkg/apis/onmetal/doc.go +++ b/pkg/apis/ironcore/doc.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,8 +13,8 @@ // limitations under the License. // +k8s:deepcopy-gen=package -// +groupName="onmetal.provider.extensions.gardener.cloud" +// +groupName="ironcore.provider.extensions.gardener.cloud" //go:generate ../../../hack/update-codegen.sh -package onmetal // import "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" +package ironcore // import "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" diff --git a/pkg/apis/onmetal/helper/scheme.go b/pkg/apis/ironcore/helper/scheme.go similarity index 91% rename from pkg/apis/onmetal/helper/scheme.go rename to pkg/apis/ironcore/helper/scheme.go index 9843954c..f3bc6e32 100644 --- a/pkg/apis/onmetal/helper/scheme.go +++ b/pkg/apis/ironcore/helper/scheme.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - api "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/install" + api "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/install" ) var ( - // Scheme is a scheme with the types relevant for onmetal actuators. + // Scheme is a scheme with the types relevant for ironcore actuators. Scheme *runtime.Scheme decoder runtime.Decoder diff --git a/pkg/apis/onmetal/install/install.go b/pkg/apis/ironcore/install/install.go similarity index 82% rename from pkg/apis/onmetal/install/install.go rename to pkg/apis/ironcore/install/install.go index 035c687e..0eaecc6f 100644 --- a/pkg/apis/onmetal/install/install.go +++ b/pkg/apis/ironcore/install/install.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,14 +18,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" ) var ( schemeBuilder = runtime.NewSchemeBuilder( v1alpha1.AddToScheme, - onmetal.AddToScheme, + ironcore.AddToScheme, setVersionPriority, ) diff --git a/pkg/apis/onmetal/register.go b/pkg/apis/ironcore/register.go similarity index 93% rename from pkg/apis/onmetal/register.go rename to pkg/apis/ironcore/register.go index 3190b4d0..80e19570 100644 --- a/pkg/apis/onmetal/register.go +++ b/pkg/apis/ironcore/register.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore import ( "k8s.io/apimachinery/pkg/runtime" @@ -20,7 +20,7 @@ import ( ) // GroupName is the group name use in this package -const GroupName = "onmetal.provider.extensions.gardener.cloud" +const GroupName = "ironcore.provider.extensions.gardener.cloud" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} diff --git a/pkg/apis/onmetal/types_cloudprofile.go b/pkg/apis/ironcore/types_cloudprofile.go similarity index 98% rename from pkg/apis/onmetal/types_cloudprofile.go rename to pkg/apis/ironcore/types_cloudprofile.go index f446ec42..c3c71682 100644 --- a/pkg/apis/onmetal/types_cloudprofile.go +++ b/pkg/apis/ironcore/types_cloudprofile.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/onmetal/types_controlplane.go b/pkg/apis/ironcore/types_controlplane.go similarity index 95% rename from pkg/apis/onmetal/types_controlplane.go rename to pkg/apis/ironcore/types_controlplane.go index 8adbf678..0e9b8316 100644 --- a/pkg/apis/onmetal/types_controlplane.go +++ b/pkg/apis/ironcore/types_controlplane.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/onmetal/types_infrastructure.go b/pkg/apis/ironcore/types_infrastructure.go similarity index 94% rename from pkg/apis/onmetal/types_infrastructure.go rename to pkg/apis/ironcore/types_infrastructure.go index ba0fe635..3c61a193 100644 --- a/pkg/apis/onmetal/types_infrastructure.go +++ b/pkg/apis/ironcore/types_infrastructure.go @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore import ( - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/onmetal/types_worker.go b/pkg/apis/ironcore/types_worker.go similarity index 97% rename from pkg/apis/onmetal/types_worker.go rename to pkg/apis/ironcore/types_worker.go index c52ceb5b..a38cade3 100644 --- a/pkg/apis/onmetal/types_worker.go +++ b/pkg/apis/ironcore/types_worker.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -33,7 +33,7 @@ type WorkerStatus struct { MachineImages []MachineImage } -// MachineImage is a mapping from logical names and versions to onmetal-specific identifiers. +// MachineImage is a mapping from logical names and versions to ironcore-specific identifiers. type MachineImage struct { // Name is the logical name of the machine image. Name string diff --git a/pkg/apis/onmetal/v1alpha1/defaults.go b/pkg/apis/ironcore/v1alpha1/defaults.go similarity index 95% rename from pkg/apis/onmetal/v1alpha1/defaults.go rename to pkg/apis/ironcore/v1alpha1/defaults.go index a966d984..f2570b91 100644 --- a/pkg/apis/onmetal/v1alpha1/defaults.go +++ b/pkg/apis/ironcore/v1alpha1/defaults.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/onmetal/v1alpha1/doc.go b/pkg/apis/ironcore/v1alpha1/doc.go similarity index 63% rename from pkg/apis/onmetal/v1alpha1/doc.go rename to pkg/apis/ironcore/v1alpha1/doc.go index 4566bd83..94f18791 100644 --- a/pkg/apis/onmetal/v1alpha1/doc.go +++ b/pkg/apis/ironcore/v1alpha1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,10 +13,10 @@ // limitations under the License. // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal +// +k8s:conversion-gen=github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta -// Package v1alpha1 contains the onmetal provider API resources. -// +groupName=onmetal.provider.extensions.gardener.cloud -package v1alpha1 // import "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" +// Package v1alpha1 contains the ironcore provider API resources. +// +groupName=ironcore.provider.extensions.gardener.cloud +package v1alpha1 // import "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" diff --git a/pkg/apis/onmetal/v1alpha1/register.go b/pkg/apis/ironcore/v1alpha1/register.go similarity index 94% rename from pkg/apis/onmetal/v1alpha1/register.go rename to pkg/apis/ironcore/v1alpha1/register.go index 5ff5f108..d24e20e3 100644 --- a/pkg/apis/onmetal/v1alpha1/register.go +++ b/pkg/apis/ironcore/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( ) // GroupName is the group name use in this package -const GroupName = "onmetal.provider.extensions.gardener.cloud" +const GroupName = "ironcore.provider.extensions.gardener.cloud" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/pkg/apis/onmetal/v1alpha1/types_cloudprofile.go b/pkg/apis/ironcore/v1alpha1/types_cloudprofile.go similarity index 98% rename from pkg/apis/onmetal/v1alpha1/types_cloudprofile.go rename to pkg/apis/ironcore/v1alpha1/types_cloudprofile.go index 8dae2dd5..72da0b39 100644 --- a/pkg/apis/onmetal/v1alpha1/types_cloudprofile.go +++ b/pkg/apis/ironcore/v1alpha1/types_cloudprofile.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/onmetal/v1alpha1/types_controlplane.go b/pkg/apis/ironcore/v1alpha1/types_controlplane.go similarity index 97% rename from pkg/apis/onmetal/v1alpha1/types_controlplane.go rename to pkg/apis/ironcore/v1alpha1/types_controlplane.go index beb7b127..05bcd28e 100644 --- a/pkg/apis/onmetal/v1alpha1/types_controlplane.go +++ b/pkg/apis/ironcore/v1alpha1/types_controlplane.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/onmetal/v1alpha1/types_infrastructure.go b/pkg/apis/ironcore/v1alpha1/types_infrastructure.go similarity index 93% rename from pkg/apis/onmetal/v1alpha1/types_infrastructure.go rename to pkg/apis/ironcore/v1alpha1/types_infrastructure.go index dd93a120..4dd48239 100644 --- a/pkg/apis/onmetal/v1alpha1/types_infrastructure.go +++ b/pkg/apis/ironcore/v1alpha1/types_infrastructure.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ package v1alpha1 import ( - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/onmetal/v1alpha1/types_worker.go b/pkg/apis/ironcore/v1alpha1/types_worker.go similarity index 96% rename from pkg/apis/onmetal/v1alpha1/types_worker.go rename to pkg/apis/ironcore/v1alpha1/types_worker.go index fe6c579d..cedd497e 100644 --- a/pkg/apis/onmetal/v1alpha1/types_worker.go +++ b/pkg/apis/ironcore/v1alpha1/types_worker.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ type WorkerStatus struct { MachineImages []MachineImage `json:"machineImages,omitempty"` } -// MachineImage is a mapping from logical names and versions to onmetal-specific identifiers. +// MachineImage is a mapping from logical names and versions to ironcore-specific identifiers. type MachineImage struct { // Name is the logical name of the machine image. Name string `json:"name"` diff --git a/pkg/apis/onmetal/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/ironcore/v1alpha1/v1alpha1_suite_test.go similarity index 95% rename from pkg/apis/onmetal/v1alpha1/v1alpha1_suite_test.go rename to pkg/apis/ironcore/v1alpha1/v1alpha1_suite_test.go index 4d8ef7f7..b840a7cb 100644 --- a/pkg/apis/onmetal/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/ironcore/v1alpha1/v1alpha1_suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/ironcore/v1alpha1/zz_generated.conversion.go b/pkg/apis/ironcore/v1alpha1/zz_generated.conversion.go new file mode 100644 index 00000000..a5d0fd25 --- /dev/null +++ b/pkg/apis/ironcore/v1alpha1/zz_generated.conversion.go @@ -0,0 +1,432 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* + * Copyright (c) 2021 by the IronCore 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. + */ +// Code generated by conversion-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + unsafe "unsafe" + + ironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + v1 "k8s.io/api/core/v1" + conversion "k8s.io/apimachinery/pkg/conversion" + runtime "k8s.io/apimachinery/pkg/runtime" +) + +func init() { + localSchemeBuilder.Register(RegisterConversions) +} + +// RegisterConversions adds conversion functions to the given scheme. +// Public to allow building arbitrary schemes. +func RegisterConversions(s *runtime.Scheme) error { + if err := s.AddGeneratedConversionFunc((*CloudControllerManagerConfig)(nil), (*ironcore.CloudControllerManagerConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_CloudControllerManagerConfig_To_ironcore_CloudControllerManagerConfig(a.(*CloudControllerManagerConfig), b.(*ironcore.CloudControllerManagerConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.CloudControllerManagerConfig)(nil), (*CloudControllerManagerConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig(a.(*ironcore.CloudControllerManagerConfig), b.(*CloudControllerManagerConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*CloudProfileConfig)(nil), (*ironcore.CloudProfileConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_CloudProfileConfig_To_ironcore_CloudProfileConfig(a.(*CloudProfileConfig), b.(*ironcore.CloudProfileConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.CloudProfileConfig)(nil), (*CloudProfileConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_CloudProfileConfig_To_v1alpha1_CloudProfileConfig(a.(*ironcore.CloudProfileConfig), b.(*CloudProfileConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ControlPlaneConfig)(nil), (*ironcore.ControlPlaneConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_ControlPlaneConfig_To_ironcore_ControlPlaneConfig(a.(*ControlPlaneConfig), b.(*ironcore.ControlPlaneConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.ControlPlaneConfig)(nil), (*ControlPlaneConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig(a.(*ironcore.ControlPlaneConfig), b.(*ControlPlaneConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*InfrastructureConfig)(nil), (*ironcore.InfrastructureConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_InfrastructureConfig_To_ironcore_InfrastructureConfig(a.(*InfrastructureConfig), b.(*ironcore.InfrastructureConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.InfrastructureConfig)(nil), (*InfrastructureConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_InfrastructureConfig_To_v1alpha1_InfrastructureConfig(a.(*ironcore.InfrastructureConfig), b.(*InfrastructureConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*InfrastructureStatus)(nil), (*ironcore.InfrastructureStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_InfrastructureStatus_To_ironcore_InfrastructureStatus(a.(*InfrastructureStatus), b.(*ironcore.InfrastructureStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.InfrastructureStatus)(nil), (*InfrastructureStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_InfrastructureStatus_To_v1alpha1_InfrastructureStatus(a.(*ironcore.InfrastructureStatus), b.(*InfrastructureStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*MachineImage)(nil), (*ironcore.MachineImage)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_MachineImage_To_ironcore_MachineImage(a.(*MachineImage), b.(*ironcore.MachineImage), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.MachineImage)(nil), (*MachineImage)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_MachineImage_To_v1alpha1_MachineImage(a.(*ironcore.MachineImage), b.(*MachineImage), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*MachineImageVersion)(nil), (*ironcore.MachineImageVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_MachineImageVersion_To_ironcore_MachineImageVersion(a.(*MachineImageVersion), b.(*ironcore.MachineImageVersion), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.MachineImageVersion)(nil), (*MachineImageVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_MachineImageVersion_To_v1alpha1_MachineImageVersion(a.(*ironcore.MachineImageVersion), b.(*MachineImageVersion), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*MachineImages)(nil), (*ironcore.MachineImages)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_MachineImages_To_ironcore_MachineImages(a.(*MachineImages), b.(*ironcore.MachineImages), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.MachineImages)(nil), (*MachineImages)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_MachineImages_To_v1alpha1_MachineImages(a.(*ironcore.MachineImages), b.(*MachineImages), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*RegionConfig)(nil), (*ironcore.RegionConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_RegionConfig_To_ironcore_RegionConfig(a.(*RegionConfig), b.(*ironcore.RegionConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.RegionConfig)(nil), (*RegionConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_RegionConfig_To_v1alpha1_RegionConfig(a.(*ironcore.RegionConfig), b.(*RegionConfig), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*StorageClass)(nil), (*ironcore.StorageClass)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_StorageClass_To_ironcore_StorageClass(a.(*StorageClass), b.(*ironcore.StorageClass), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.StorageClass)(nil), (*StorageClass)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_StorageClass_To_v1alpha1_StorageClass(a.(*ironcore.StorageClass), b.(*StorageClass), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*StorageClasses)(nil), (*ironcore.StorageClasses)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_StorageClasses_To_ironcore_StorageClasses(a.(*StorageClasses), b.(*ironcore.StorageClasses), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.StorageClasses)(nil), (*StorageClasses)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_StorageClasses_To_v1alpha1_StorageClasses(a.(*ironcore.StorageClasses), b.(*StorageClasses), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*WorkerStatus)(nil), (*ironcore.WorkerStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_WorkerStatus_To_ironcore_WorkerStatus(a.(*WorkerStatus), b.(*ironcore.WorkerStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*ironcore.WorkerStatus)(nil), (*WorkerStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_ironcore_WorkerStatus_To_v1alpha1_WorkerStatus(a.(*ironcore.WorkerStatus), b.(*WorkerStatus), scope) + }); err != nil { + return err + } + return nil +} + +func autoConvert_v1alpha1_CloudControllerManagerConfig_To_ironcore_CloudControllerManagerConfig(in *CloudControllerManagerConfig, out *ironcore.CloudControllerManagerConfig, s conversion.Scope) error { + out.FeatureGates = *(*map[string]bool)(unsafe.Pointer(&in.FeatureGates)) + return nil +} + +// Convert_v1alpha1_CloudControllerManagerConfig_To_ironcore_CloudControllerManagerConfig is an autogenerated conversion function. +func Convert_v1alpha1_CloudControllerManagerConfig_To_ironcore_CloudControllerManagerConfig(in *CloudControllerManagerConfig, out *ironcore.CloudControllerManagerConfig, s conversion.Scope) error { + return autoConvert_v1alpha1_CloudControllerManagerConfig_To_ironcore_CloudControllerManagerConfig(in, out, s) +} + +func autoConvert_ironcore_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig(in *ironcore.CloudControllerManagerConfig, out *CloudControllerManagerConfig, s conversion.Scope) error { + out.FeatureGates = *(*map[string]bool)(unsafe.Pointer(&in.FeatureGates)) + return nil +} + +// Convert_ironcore_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig is an autogenerated conversion function. +func Convert_ironcore_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig(in *ironcore.CloudControllerManagerConfig, out *CloudControllerManagerConfig, s conversion.Scope) error { + return autoConvert_ironcore_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig(in, out, s) +} + +func autoConvert_v1alpha1_CloudProfileConfig_To_ironcore_CloudProfileConfig(in *CloudProfileConfig, out *ironcore.CloudProfileConfig, s conversion.Scope) error { + out.MachineImages = *(*[]ironcore.MachineImages)(unsafe.Pointer(&in.MachineImages)) + out.RegionConfigs = *(*[]ironcore.RegionConfig)(unsafe.Pointer(&in.RegionConfigs)) + if err := Convert_v1alpha1_StorageClasses_To_ironcore_StorageClasses(&in.StorageClasses, &out.StorageClasses, s); err != nil { + return err + } + return nil +} + +// Convert_v1alpha1_CloudProfileConfig_To_ironcore_CloudProfileConfig is an autogenerated conversion function. +func Convert_v1alpha1_CloudProfileConfig_To_ironcore_CloudProfileConfig(in *CloudProfileConfig, out *ironcore.CloudProfileConfig, s conversion.Scope) error { + return autoConvert_v1alpha1_CloudProfileConfig_To_ironcore_CloudProfileConfig(in, out, s) +} + +func autoConvert_ironcore_CloudProfileConfig_To_v1alpha1_CloudProfileConfig(in *ironcore.CloudProfileConfig, out *CloudProfileConfig, s conversion.Scope) error { + out.MachineImages = *(*[]MachineImages)(unsafe.Pointer(&in.MachineImages)) + out.RegionConfigs = *(*[]RegionConfig)(unsafe.Pointer(&in.RegionConfigs)) + if err := Convert_ironcore_StorageClasses_To_v1alpha1_StorageClasses(&in.StorageClasses, &out.StorageClasses, s); err != nil { + return err + } + return nil +} + +// Convert_ironcore_CloudProfileConfig_To_v1alpha1_CloudProfileConfig is an autogenerated conversion function. +func Convert_ironcore_CloudProfileConfig_To_v1alpha1_CloudProfileConfig(in *ironcore.CloudProfileConfig, out *CloudProfileConfig, s conversion.Scope) error { + return autoConvert_ironcore_CloudProfileConfig_To_v1alpha1_CloudProfileConfig(in, out, s) +} + +func autoConvert_v1alpha1_ControlPlaneConfig_To_ironcore_ControlPlaneConfig(in *ControlPlaneConfig, out *ironcore.ControlPlaneConfig, s conversion.Scope) error { + out.CloudControllerManager = (*ironcore.CloudControllerManagerConfig)(unsafe.Pointer(in.CloudControllerManager)) + return nil +} + +// Convert_v1alpha1_ControlPlaneConfig_To_ironcore_ControlPlaneConfig is an autogenerated conversion function. +func Convert_v1alpha1_ControlPlaneConfig_To_ironcore_ControlPlaneConfig(in *ControlPlaneConfig, out *ironcore.ControlPlaneConfig, s conversion.Scope) error { + return autoConvert_v1alpha1_ControlPlaneConfig_To_ironcore_ControlPlaneConfig(in, out, s) +} + +func autoConvert_ironcore_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig(in *ironcore.ControlPlaneConfig, out *ControlPlaneConfig, s conversion.Scope) error { + out.CloudControllerManager = (*CloudControllerManagerConfig)(unsafe.Pointer(in.CloudControllerManager)) + return nil +} + +// Convert_ironcore_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig is an autogenerated conversion function. +func Convert_ironcore_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig(in *ironcore.ControlPlaneConfig, out *ControlPlaneConfig, s conversion.Scope) error { + return autoConvert_ironcore_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig(in, out, s) +} + +func autoConvert_v1alpha1_InfrastructureConfig_To_ironcore_InfrastructureConfig(in *InfrastructureConfig, out *ironcore.InfrastructureConfig, s conversion.Scope) error { + out.NetworkRef = (*v1.LocalObjectReference)(unsafe.Pointer(in.NetworkRef)) + return nil +} + +// Convert_v1alpha1_InfrastructureConfig_To_ironcore_InfrastructureConfig is an autogenerated conversion function. +func Convert_v1alpha1_InfrastructureConfig_To_ironcore_InfrastructureConfig(in *InfrastructureConfig, out *ironcore.InfrastructureConfig, s conversion.Scope) error { + return autoConvert_v1alpha1_InfrastructureConfig_To_ironcore_InfrastructureConfig(in, out, s) +} + +func autoConvert_ironcore_InfrastructureConfig_To_v1alpha1_InfrastructureConfig(in *ironcore.InfrastructureConfig, out *InfrastructureConfig, s conversion.Scope) error { + out.NetworkRef = (*v1.LocalObjectReference)(unsafe.Pointer(in.NetworkRef)) + return nil +} + +// Convert_ironcore_InfrastructureConfig_To_v1alpha1_InfrastructureConfig is an autogenerated conversion function. +func Convert_ironcore_InfrastructureConfig_To_v1alpha1_InfrastructureConfig(in *ironcore.InfrastructureConfig, out *InfrastructureConfig, s conversion.Scope) error { + return autoConvert_ironcore_InfrastructureConfig_To_v1alpha1_InfrastructureConfig(in, out, s) +} + +func autoConvert_v1alpha1_InfrastructureStatus_To_ironcore_InfrastructureStatus(in *InfrastructureStatus, out *ironcore.InfrastructureStatus, s conversion.Scope) error { + out.NetworkRef = in.NetworkRef + out.NATGatewayRef = in.NATGatewayRef + out.PrefixRef = in.PrefixRef + return nil +} + +// Convert_v1alpha1_InfrastructureStatus_To_ironcore_InfrastructureStatus is an autogenerated conversion function. +func Convert_v1alpha1_InfrastructureStatus_To_ironcore_InfrastructureStatus(in *InfrastructureStatus, out *ironcore.InfrastructureStatus, s conversion.Scope) error { + return autoConvert_v1alpha1_InfrastructureStatus_To_ironcore_InfrastructureStatus(in, out, s) +} + +func autoConvert_ironcore_InfrastructureStatus_To_v1alpha1_InfrastructureStatus(in *ironcore.InfrastructureStatus, out *InfrastructureStatus, s conversion.Scope) error { + out.NetworkRef = in.NetworkRef + out.NATGatewayRef = in.NATGatewayRef + out.PrefixRef = in.PrefixRef + return nil +} + +// Convert_ironcore_InfrastructureStatus_To_v1alpha1_InfrastructureStatus is an autogenerated conversion function. +func Convert_ironcore_InfrastructureStatus_To_v1alpha1_InfrastructureStatus(in *ironcore.InfrastructureStatus, out *InfrastructureStatus, s conversion.Scope) error { + return autoConvert_ironcore_InfrastructureStatus_To_v1alpha1_InfrastructureStatus(in, out, s) +} + +func autoConvert_v1alpha1_MachineImage_To_ironcore_MachineImage(in *MachineImage, out *ironcore.MachineImage, s conversion.Scope) error { + out.Name = in.Name + out.Version = in.Version + out.Image = in.Image + out.Architecture = (*string)(unsafe.Pointer(in.Architecture)) + return nil +} + +// Convert_v1alpha1_MachineImage_To_ironcore_MachineImage is an autogenerated conversion function. +func Convert_v1alpha1_MachineImage_To_ironcore_MachineImage(in *MachineImage, out *ironcore.MachineImage, s conversion.Scope) error { + return autoConvert_v1alpha1_MachineImage_To_ironcore_MachineImage(in, out, s) +} + +func autoConvert_ironcore_MachineImage_To_v1alpha1_MachineImage(in *ironcore.MachineImage, out *MachineImage, s conversion.Scope) error { + out.Name = in.Name + out.Version = in.Version + out.Image = in.Image + out.Architecture = (*string)(unsafe.Pointer(in.Architecture)) + return nil +} + +// Convert_ironcore_MachineImage_To_v1alpha1_MachineImage is an autogenerated conversion function. +func Convert_ironcore_MachineImage_To_v1alpha1_MachineImage(in *ironcore.MachineImage, out *MachineImage, s conversion.Scope) error { + return autoConvert_ironcore_MachineImage_To_v1alpha1_MachineImage(in, out, s) +} + +func autoConvert_v1alpha1_MachineImageVersion_To_ironcore_MachineImageVersion(in *MachineImageVersion, out *ironcore.MachineImageVersion, s conversion.Scope) error { + out.Version = in.Version + out.Image = in.Image + out.Architecture = (*string)(unsafe.Pointer(in.Architecture)) + return nil +} + +// Convert_v1alpha1_MachineImageVersion_To_ironcore_MachineImageVersion is an autogenerated conversion function. +func Convert_v1alpha1_MachineImageVersion_To_ironcore_MachineImageVersion(in *MachineImageVersion, out *ironcore.MachineImageVersion, s conversion.Scope) error { + return autoConvert_v1alpha1_MachineImageVersion_To_ironcore_MachineImageVersion(in, out, s) +} + +func autoConvert_ironcore_MachineImageVersion_To_v1alpha1_MachineImageVersion(in *ironcore.MachineImageVersion, out *MachineImageVersion, s conversion.Scope) error { + out.Version = in.Version + out.Image = in.Image + out.Architecture = (*string)(unsafe.Pointer(in.Architecture)) + return nil +} + +// Convert_ironcore_MachineImageVersion_To_v1alpha1_MachineImageVersion is an autogenerated conversion function. +func Convert_ironcore_MachineImageVersion_To_v1alpha1_MachineImageVersion(in *ironcore.MachineImageVersion, out *MachineImageVersion, s conversion.Scope) error { + return autoConvert_ironcore_MachineImageVersion_To_v1alpha1_MachineImageVersion(in, out, s) +} + +func autoConvert_v1alpha1_MachineImages_To_ironcore_MachineImages(in *MachineImages, out *ironcore.MachineImages, s conversion.Scope) error { + out.Name = in.Name + out.Versions = *(*[]ironcore.MachineImageVersion)(unsafe.Pointer(&in.Versions)) + return nil +} + +// Convert_v1alpha1_MachineImages_To_ironcore_MachineImages is an autogenerated conversion function. +func Convert_v1alpha1_MachineImages_To_ironcore_MachineImages(in *MachineImages, out *ironcore.MachineImages, s conversion.Scope) error { + return autoConvert_v1alpha1_MachineImages_To_ironcore_MachineImages(in, out, s) +} + +func autoConvert_ironcore_MachineImages_To_v1alpha1_MachineImages(in *ironcore.MachineImages, out *MachineImages, s conversion.Scope) error { + out.Name = in.Name + out.Versions = *(*[]MachineImageVersion)(unsafe.Pointer(&in.Versions)) + return nil +} + +// Convert_ironcore_MachineImages_To_v1alpha1_MachineImages is an autogenerated conversion function. +func Convert_ironcore_MachineImages_To_v1alpha1_MachineImages(in *ironcore.MachineImages, out *MachineImages, s conversion.Scope) error { + return autoConvert_ironcore_MachineImages_To_v1alpha1_MachineImages(in, out, s) +} + +func autoConvert_v1alpha1_RegionConfig_To_ironcore_RegionConfig(in *RegionConfig, out *ironcore.RegionConfig, s conversion.Scope) error { + out.Name = in.Name + out.Server = in.Server + out.CertificateAuthorityData = *(*[]byte)(unsafe.Pointer(&in.CertificateAuthorityData)) + return nil +} + +// Convert_v1alpha1_RegionConfig_To_ironcore_RegionConfig is an autogenerated conversion function. +func Convert_v1alpha1_RegionConfig_To_ironcore_RegionConfig(in *RegionConfig, out *ironcore.RegionConfig, s conversion.Scope) error { + return autoConvert_v1alpha1_RegionConfig_To_ironcore_RegionConfig(in, out, s) +} + +func autoConvert_ironcore_RegionConfig_To_v1alpha1_RegionConfig(in *ironcore.RegionConfig, out *RegionConfig, s conversion.Scope) error { + out.Name = in.Name + out.Server = in.Server + out.CertificateAuthorityData = *(*[]byte)(unsafe.Pointer(&in.CertificateAuthorityData)) + return nil +} + +// Convert_ironcore_RegionConfig_To_v1alpha1_RegionConfig is an autogenerated conversion function. +func Convert_ironcore_RegionConfig_To_v1alpha1_RegionConfig(in *ironcore.RegionConfig, out *RegionConfig, s conversion.Scope) error { + return autoConvert_ironcore_RegionConfig_To_v1alpha1_RegionConfig(in, out, s) +} + +func autoConvert_v1alpha1_StorageClass_To_ironcore_StorageClass(in *StorageClass, out *ironcore.StorageClass, s conversion.Scope) error { + out.Name = in.Name + out.Type = in.Type + return nil +} + +// Convert_v1alpha1_StorageClass_To_ironcore_StorageClass is an autogenerated conversion function. +func Convert_v1alpha1_StorageClass_To_ironcore_StorageClass(in *StorageClass, out *ironcore.StorageClass, s conversion.Scope) error { + return autoConvert_v1alpha1_StorageClass_To_ironcore_StorageClass(in, out, s) +} + +func autoConvert_ironcore_StorageClass_To_v1alpha1_StorageClass(in *ironcore.StorageClass, out *StorageClass, s conversion.Scope) error { + out.Name = in.Name + out.Type = in.Type + return nil +} + +// Convert_ironcore_StorageClass_To_v1alpha1_StorageClass is an autogenerated conversion function. +func Convert_ironcore_StorageClass_To_v1alpha1_StorageClass(in *ironcore.StorageClass, out *StorageClass, s conversion.Scope) error { + return autoConvert_ironcore_StorageClass_To_v1alpha1_StorageClass(in, out, s) +} + +func autoConvert_v1alpha1_StorageClasses_To_ironcore_StorageClasses(in *StorageClasses, out *ironcore.StorageClasses, s conversion.Scope) error { + out.Default = (*ironcore.StorageClass)(unsafe.Pointer(in.Default)) + out.Additional = *(*[]ironcore.StorageClass)(unsafe.Pointer(&in.Additional)) + return nil +} + +// Convert_v1alpha1_StorageClasses_To_ironcore_StorageClasses is an autogenerated conversion function. +func Convert_v1alpha1_StorageClasses_To_ironcore_StorageClasses(in *StorageClasses, out *ironcore.StorageClasses, s conversion.Scope) error { + return autoConvert_v1alpha1_StorageClasses_To_ironcore_StorageClasses(in, out, s) +} + +func autoConvert_ironcore_StorageClasses_To_v1alpha1_StorageClasses(in *ironcore.StorageClasses, out *StorageClasses, s conversion.Scope) error { + out.Default = (*StorageClass)(unsafe.Pointer(in.Default)) + out.Additional = *(*[]StorageClass)(unsafe.Pointer(&in.Additional)) + return nil +} + +// Convert_ironcore_StorageClasses_To_v1alpha1_StorageClasses is an autogenerated conversion function. +func Convert_ironcore_StorageClasses_To_v1alpha1_StorageClasses(in *ironcore.StorageClasses, out *StorageClasses, s conversion.Scope) error { + return autoConvert_ironcore_StorageClasses_To_v1alpha1_StorageClasses(in, out, s) +} + +func autoConvert_v1alpha1_WorkerStatus_To_ironcore_WorkerStatus(in *WorkerStatus, out *ironcore.WorkerStatus, s conversion.Scope) error { + out.MachineImages = *(*[]ironcore.MachineImage)(unsafe.Pointer(&in.MachineImages)) + return nil +} + +// Convert_v1alpha1_WorkerStatus_To_ironcore_WorkerStatus is an autogenerated conversion function. +func Convert_v1alpha1_WorkerStatus_To_ironcore_WorkerStatus(in *WorkerStatus, out *ironcore.WorkerStatus, s conversion.Scope) error { + return autoConvert_v1alpha1_WorkerStatus_To_ironcore_WorkerStatus(in, out, s) +} + +func autoConvert_ironcore_WorkerStatus_To_v1alpha1_WorkerStatus(in *ironcore.WorkerStatus, out *WorkerStatus, s conversion.Scope) error { + out.MachineImages = *(*[]MachineImage)(unsafe.Pointer(&in.MachineImages)) + return nil +} + +// Convert_ironcore_WorkerStatus_To_v1alpha1_WorkerStatus is an autogenerated conversion function. +func Convert_ironcore_WorkerStatus_To_v1alpha1_WorkerStatus(in *ironcore.WorkerStatus, out *WorkerStatus, s conversion.Scope) error { + return autoConvert_ironcore_WorkerStatus_To_v1alpha1_WorkerStatus(in, out, s) +} diff --git a/pkg/apis/onmetal/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/ironcore/v1alpha1/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/onmetal/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/ironcore/v1alpha1/zz_generated.deepcopy.go index cef72116..914702e6 100644 --- a/pkg/apis/onmetal/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/ironcore/v1alpha1/zz_generated.deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* - * Copyright (c) 2021 by the OnMetal authors. + * Copyright (c) 2021 by the IronCore authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pkg/apis/onmetal/v1alpha1/zz_generated.defaults.go b/pkg/apis/ironcore/v1alpha1/zz_generated.defaults.go similarity index 95% rename from pkg/apis/onmetal/v1alpha1/zz_generated.defaults.go rename to pkg/apis/ironcore/v1alpha1/zz_generated.defaults.go index eed1d793..1e1afc5e 100644 --- a/pkg/apis/onmetal/v1alpha1/zz_generated.defaults.go +++ b/pkg/apis/ironcore/v1alpha1/zz_generated.defaults.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* - * Copyright (c) 2021 by the OnMetal authors. + * Copyright (c) 2021 by the IronCore authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pkg/apis/onmetal/validation/cloudprofile.go b/pkg/apis/ironcore/validation/cloudprofile.go similarity index 87% rename from pkg/apis/onmetal/validation/cloudprofile.go rename to pkg/apis/ironcore/validation/cloudprofile.go index e0c8ba56..959503cf 100644 --- a/pkg/apis/onmetal/validation/cloudprofile.go +++ b/pkg/apis/ironcore/validation/cloudprofile.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/utils/strings/slices" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" ) // ValidateCloudProfileConfig validates a CloudProfileConfig object. -func ValidateCloudProfileConfig(cpConfig *apisonmetal.CloudProfileConfig, machineImages []gardenercore.MachineImage, fldPath *field.Path) field.ErrorList { +func ValidateCloudProfileConfig(cpConfig *apisironcore.CloudProfileConfig, machineImages []gardenercore.MachineImage, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} machineImagesPath := fldPath.Child("machineImages") @@ -61,7 +61,7 @@ func ValidateCloudProfileConfig(cpConfig *apisonmetal.CloudProfileConfig, machin return allErrs } -func validateVersions(versionsConfig []apisonmetal.MachineImageVersion, versions []gardenercore.ExpirableVersion, fldPath *field.Path) field.ErrorList { +func validateVersions(versionsConfig []apisironcore.MachineImageVersion, versions []gardenercore.ExpirableVersion, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} for _, version := range versions { diff --git a/pkg/apis/onmetal/validation/cloudprofile_test.go b/pkg/apis/ironcore/validation/cloudprofile_test.go similarity index 85% rename from pkg/apis/onmetal/validation/cloudprofile_test.go rename to pkg/apis/ironcore/validation/cloudprofile_test.go index 01390cac..38a362a8 100644 --- a/pkg/apis/onmetal/validation/cloudprofile_test.go +++ b/pkg/apis/ironcore/validation/cloudprofile_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/utils/pointer" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" ) func InvalidField(fld string) types.GomegaMatcher { @@ -40,7 +40,7 @@ func SimpleMatchField(errorType field.ErrorType, fld string) types.GomegaMatcher var _ = Describe("CloudProfileConfig validation", func() { Describe("#ValidateCloudProfileConfig", func() { var ( - cloudProfileConfig *apisonmetal.CloudProfileConfig + cloudProfileConfig *apisironcore.CloudProfileConfig machineImages []core.MachineImage nilPath *field.Path machineImageName string @@ -50,11 +50,11 @@ var _ = Describe("CloudProfileConfig validation", func() { BeforeEach(func() { machineImageName = "ubuntu" machineImageVersion = "1.2.3" - cloudProfileConfig = &apisonmetal.CloudProfileConfig{ - MachineImages: []apisonmetal.MachineImages{ + cloudProfileConfig = &apisironcore.CloudProfileConfig{ + MachineImages: []apisironcore.MachineImages{ { Name: machineImageName, - Versions: []apisonmetal.MachineImageVersion{ + Versions: []apisironcore.MachineImageVersion{ { Version: machineImageVersion, Image: "registry/image:sha1234", @@ -63,12 +63,12 @@ var _ = Describe("CloudProfileConfig validation", func() { }, }, }, - StorageClasses: apisonmetal.StorageClasses{ - Default: &apisonmetal.StorageClass{ + StorageClasses: apisironcore.StorageClasses{ + Default: &apisironcore.StorageClass{ Name: "default", Type: "defaultType", }, - Additional: []apisonmetal.StorageClass{ + Additional: []apisironcore.StorageClass{ { Name: "foo", Type: "fooType", @@ -151,14 +151,14 @@ var _ = Describe("CloudProfileConfig validation", func() { }) DescribeTable("ValidateCloudProfileConfig StorageClass name", - func(cpConfig *apisonmetal.CloudProfileConfig, machineImages []core.MachineImage, fldPath *field.Path, match types.GomegaMatcher) { + func(cpConfig *apisironcore.CloudProfileConfig, machineImages []core.MachineImage, fldPath *field.Path, match types.GomegaMatcher) { errList := ValidateCloudProfileConfig(cpConfig, machineImages, fldPath) Expect(errList).To(match) }, Entry("invalid storageClass name in default StorageClass", - &apisonmetal.CloudProfileConfig{ - StorageClasses: apisonmetal.StorageClasses{ - Default: &apisonmetal.StorageClass{ + &apisironcore.CloudProfileConfig{ + StorageClasses: apisironcore.StorageClasses{ + Default: &apisironcore.StorageClass{ Name: "foo*", Type: "defaultType", }, @@ -169,9 +169,9 @@ var _ = Describe("CloudProfileConfig validation", func() { ContainElement(InvalidField("storageClasses.defaultStorageClasses.name")), ), Entry("invalid storageClass name in additional storageClasses", - &apisonmetal.CloudProfileConfig{ - StorageClasses: apisonmetal.StorageClasses{ - Additional: []apisonmetal.StorageClass{ + &apisironcore.CloudProfileConfig{ + StorageClasses: apisironcore.StorageClasses{ + Additional: []apisironcore.StorageClass{ { Name: "foo*", Type: "defaultType", diff --git a/pkg/apis/onmetal/validation/controlplane.go b/pkg/apis/ironcore/validation/controlplane.go similarity index 82% rename from pkg/apis/onmetal/validation/controlplane.go rename to pkg/apis/ironcore/validation/controlplane.go index 2b4483e9..ea2f1680 100644 --- a/pkg/apis/onmetal/validation/controlplane.go +++ b/pkg/apis/ironcore/validation/controlplane.go @@ -18,11 +18,11 @@ import ( featurevalidation "github.com/gardener/gardener/pkg/utils/validation/features" "k8s.io/apimachinery/pkg/util/validation/field" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" ) // ValidateControlPlaneConfig validates a ControlPlaneConfig object. -func ValidateControlPlaneConfig(controlPlaneConfig *apisonmetal.ControlPlaneConfig, version string, fldPath *field.Path) field.ErrorList { +func ValidateControlPlaneConfig(controlPlaneConfig *apisironcore.ControlPlaneConfig, version string, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} if controlPlaneConfig.CloudControllerManager != nil { @@ -33,7 +33,7 @@ func ValidateControlPlaneConfig(controlPlaneConfig *apisonmetal.ControlPlaneConf } // ValidateControlPlaneConfigUpdate validates a ControlPlaneConfig object. -func ValidateControlPlaneConfigUpdate(oldConfig, newConfig *apisonmetal.ControlPlaneConfig, fldPath *field.Path) field.ErrorList { +func ValidateControlPlaneConfigUpdate(oldConfig, newConfig *apisironcore.ControlPlaneConfig, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} return allErrs diff --git a/pkg/apis/onmetal/validation/controlplane_test.go b/pkg/apis/ironcore/validation/controlplane_test.go similarity index 86% rename from pkg/apis/onmetal/validation/controlplane_test.go rename to pkg/apis/ironcore/validation/controlplane_test.go index d237eb8a..770feff0 100644 --- a/pkg/apis/onmetal/validation/controlplane_test.go +++ b/pkg/apis/ironcore/validation/controlplane_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,17 +20,17 @@ import ( . "github.com/onsi/gomega/gstruct" "k8s.io/apimachinery/pkg/util/validation/field" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" ) var _ = Describe("ControlPlaneConfig validation", func() { var ( - controlPlane *apisonmetal.ControlPlaneConfig + controlPlane *apisironcore.ControlPlaneConfig fldPath *field.Path ) BeforeEach(func() { - controlPlane = &apisonmetal.ControlPlaneConfig{} + controlPlane = &apisironcore.ControlPlaneConfig{} }) Describe("#ValidateControlPlaneConfig", func() { @@ -39,7 +39,7 @@ var _ = Describe("ControlPlaneConfig validation", func() { }) It("should fail with invalid CCM feature gates", func() { - controlPlane.CloudControllerManager = &apisonmetal.CloudControllerManagerConfig{ + controlPlane.CloudControllerManager = &apisironcore.CloudControllerManagerConfig{ FeatureGates: map[string]bool{ "AnyVolumeDataSource": true, "CustomResourceValidation": true, diff --git a/pkg/apis/onmetal/validation/infrastructure.go b/pkg/apis/ironcore/validation/infrastructure.go similarity index 79% rename from pkg/apis/onmetal/validation/infrastructure.go rename to pkg/apis/ironcore/validation/infrastructure.go index 92eaa7da..46b0b9ef 100644 --- a/pkg/apis/onmetal/validation/infrastructure.go +++ b/pkg/apis/ironcore/validation/infrastructure.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,11 +18,11 @@ import ( apivalidation "k8s.io/apimachinery/pkg/api/validation" "k8s.io/apimachinery/pkg/util/validation/field" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" ) // ValidateInfrastructureConfig validates a InfrastructureConfig object. -func ValidateInfrastructureConfig(infra *apisonmetal.InfrastructureConfig, nodesCIDR, podsCIDR, servicesCIDR *string, fldPath *field.Path) field.ErrorList { +func ValidateInfrastructureConfig(infra *apisironcore.InfrastructureConfig, nodesCIDR, podsCIDR, servicesCIDR *string, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} if infra.NetworkRef != nil { @@ -35,7 +35,7 @@ func ValidateInfrastructureConfig(infra *apisonmetal.InfrastructureConfig, nodes } // ValidateInfrastructureConfigUpdate validates a InfrastructureConfig object. -func ValidateInfrastructureConfigUpdate(oldConfig, newConfig *apisonmetal.InfrastructureConfig, fldPath *field.Path) field.ErrorList { +func ValidateInfrastructureConfigUpdate(oldConfig, newConfig *apisironcore.InfrastructureConfig, fldPath *field.Path) field.ErrorList { var ( allErrs = field.ErrorList{} ) diff --git a/pkg/apis/onmetal/validation/infrastructure_test.go b/pkg/apis/ironcore/validation/infrastructure_test.go similarity index 88% rename from pkg/apis/onmetal/validation/infrastructure_test.go rename to pkg/apis/ironcore/validation/infrastructure_test.go index d20e007f..c8448ac5 100644 --- a/pkg/apis/onmetal/validation/infrastructure_test.go +++ b/pkg/apis/ironcore/validation/infrastructure_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,18 +21,18 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/validation/field" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" ) var _ = Describe("InfrastructureConfig validation", func() { var ( - infra *apisonmetal.InfrastructureConfig + infra *apisironcore.InfrastructureConfig fldPath *field.Path networkName = "test-network" ) BeforeEach(func() { - infra = &apisonmetal.InfrastructureConfig{ + infra = &apisironcore.InfrastructureConfig{ NetworkRef: &corev1.LocalObjectReference{ Name: networkName, }, diff --git a/pkg/apis/onmetal/validation/secret.go b/pkg/apis/ironcore/validation/secret.go similarity index 76% rename from pkg/apis/onmetal/validation/secret.go rename to pkg/apis/ironcore/validation/secret.go index aa32d0ed..6249a112 100644 --- a/pkg/apis/onmetal/validation/secret.go +++ b/pkg/apis/ironcore/validation/secret.go @@ -20,24 +20,24 @@ import ( corev1 "k8s.io/api/core/v1" apivalidation "k8s.io/apimachinery/pkg/api/validation" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) -// ValidateCloudProviderSecret checks whether the given secret contains a valid onmetal service account. +// ValidateCloudProviderSecret checks whether the given secret contains a valid ironcore service account. func ValidateCloudProviderSecret(secret *corev1.Secret) error { - if _, ok := secret.Data[onmetal.TokenFieldName]; !ok { - return fmt.Errorf("missing field: %s in cloud provider secret", onmetal.TokenFieldName) + if _, ok := secret.Data[ironcore.TokenFieldName]; !ok { + return fmt.Errorf("missing field: %s in cloud provider secret", ironcore.TokenFieldName) } - namespace, ok := secret.Data[onmetal.NamespaceFieldName] + namespace, ok := secret.Data[ironcore.NamespaceFieldName] if !ok { - return fmt.Errorf("missing field: %s in cloud provider secret", onmetal.NamespaceFieldName) + return fmt.Errorf("missing field: %s in cloud provider secret", ironcore.NamespaceFieldName) } - if _, ok := secret.Data[onmetal.UsernameFieldName]; !ok { - return fmt.Errorf("missing field: %s in cloud provider secret", onmetal.UsernameFieldName) + if _, ok := secret.Data[ironcore.UsernameFieldName]; !ok { + return fmt.Errorf("missing field: %s in cloud provider secret", ironcore.UsernameFieldName) } errs := apivalidation.ValidateNamespaceName(string(namespace), false) if len(errs) > 0 { - return fmt.Errorf("invalid field: %s in cloud provider secret", onmetal.NamespaceFieldName) + return fmt.Errorf("invalid field: %s in cloud provider secret", ironcore.NamespaceFieldName) } return nil diff --git a/pkg/apis/onmetal/validation/secret_test.go b/pkg/apis/ironcore/validation/secret_test.go similarity index 98% rename from pkg/apis/onmetal/validation/secret_test.go rename to pkg/apis/ironcore/validation/secret_test.go index 3215a31e..8fbcbf3d 100644 --- a/pkg/apis/onmetal/validation/secret_test.go +++ b/pkg/apis/ironcore/validation/secret_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/onmetal/validation/shoot.go b/pkg/apis/ironcore/validation/shoot.go similarity index 96% rename from pkg/apis/onmetal/validation/shoot.go rename to pkg/apis/ironcore/validation/shoot.go index f0069361..cda83e4e 100644 --- a/pkg/apis/onmetal/validation/shoot.go +++ b/pkg/apis/ironcore/validation/shoot.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ func ValidateNetworking(networking *core.Networking, fldPath *field.Path) field. allErrs := field.ErrorList{} if networking == nil || networking.Nodes == nil { - allErrs = append(allErrs, field.Required(fldPath.Child("nodes"), "a nodes CIDR must be provided for onmetal shoots")) + allErrs = append(allErrs, field.Required(fldPath.Child("nodes"), "a nodes CIDR must be provided for ironcore shoots")) } return allErrs diff --git a/pkg/apis/onmetal/validation/validation_suite_test.go b/pkg/apis/ironcore/validation/validation_suite_test.go similarity index 100% rename from pkg/apis/onmetal/validation/validation_suite_test.go rename to pkg/apis/ironcore/validation/validation_suite_test.go diff --git a/pkg/apis/onmetal/zz_generated.deepcopy.go b/pkg/apis/ironcore/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/onmetal/zz_generated.deepcopy.go rename to pkg/apis/ironcore/zz_generated.deepcopy.go index 8f42805b..afaae337 100644 --- a/pkg/apis/onmetal/zz_generated.deepcopy.go +++ b/pkg/apis/ironcore/zz_generated.deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* - * Copyright (c) 2021 by the OnMetal authors. + * Copyright (c) 2021 by the IronCore authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ */ // Code generated by deepcopy-gen. DO NOT EDIT. -package onmetal +package ironcore import ( v1 "k8s.io/api/core/v1" diff --git a/pkg/apis/onmetal/v1alpha1/zz_generated.conversion.go b/pkg/apis/onmetal/v1alpha1/zz_generated.conversion.go deleted file mode 100644 index c174fbec..00000000 --- a/pkg/apis/onmetal/v1alpha1/zz_generated.conversion.go +++ /dev/null @@ -1,432 +0,0 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - -/* - * Copyright (c) 2021 by the OnMetal 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. - */ -// Code generated by conversion-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - unsafe "unsafe" - - onmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - v1 "k8s.io/api/core/v1" - conversion "k8s.io/apimachinery/pkg/conversion" - runtime "k8s.io/apimachinery/pkg/runtime" -) - -func init() { - localSchemeBuilder.Register(RegisterConversions) -} - -// RegisterConversions adds conversion functions to the given scheme. -// Public to allow building arbitrary schemes. -func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*CloudControllerManagerConfig)(nil), (*onmetal.CloudControllerManagerConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_CloudControllerManagerConfig_To_onmetal_CloudControllerManagerConfig(a.(*CloudControllerManagerConfig), b.(*onmetal.CloudControllerManagerConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.CloudControllerManagerConfig)(nil), (*CloudControllerManagerConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig(a.(*onmetal.CloudControllerManagerConfig), b.(*CloudControllerManagerConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*CloudProfileConfig)(nil), (*onmetal.CloudProfileConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_CloudProfileConfig_To_onmetal_CloudProfileConfig(a.(*CloudProfileConfig), b.(*onmetal.CloudProfileConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.CloudProfileConfig)(nil), (*CloudProfileConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_CloudProfileConfig_To_v1alpha1_CloudProfileConfig(a.(*onmetal.CloudProfileConfig), b.(*CloudProfileConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*ControlPlaneConfig)(nil), (*onmetal.ControlPlaneConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_ControlPlaneConfig_To_onmetal_ControlPlaneConfig(a.(*ControlPlaneConfig), b.(*onmetal.ControlPlaneConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.ControlPlaneConfig)(nil), (*ControlPlaneConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig(a.(*onmetal.ControlPlaneConfig), b.(*ControlPlaneConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*InfrastructureConfig)(nil), (*onmetal.InfrastructureConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_InfrastructureConfig_To_onmetal_InfrastructureConfig(a.(*InfrastructureConfig), b.(*onmetal.InfrastructureConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.InfrastructureConfig)(nil), (*InfrastructureConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_InfrastructureConfig_To_v1alpha1_InfrastructureConfig(a.(*onmetal.InfrastructureConfig), b.(*InfrastructureConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*InfrastructureStatus)(nil), (*onmetal.InfrastructureStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_InfrastructureStatus_To_onmetal_InfrastructureStatus(a.(*InfrastructureStatus), b.(*onmetal.InfrastructureStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.InfrastructureStatus)(nil), (*InfrastructureStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_InfrastructureStatus_To_v1alpha1_InfrastructureStatus(a.(*onmetal.InfrastructureStatus), b.(*InfrastructureStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*MachineImage)(nil), (*onmetal.MachineImage)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_MachineImage_To_onmetal_MachineImage(a.(*MachineImage), b.(*onmetal.MachineImage), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.MachineImage)(nil), (*MachineImage)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_MachineImage_To_v1alpha1_MachineImage(a.(*onmetal.MachineImage), b.(*MachineImage), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*MachineImageVersion)(nil), (*onmetal.MachineImageVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_MachineImageVersion_To_onmetal_MachineImageVersion(a.(*MachineImageVersion), b.(*onmetal.MachineImageVersion), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.MachineImageVersion)(nil), (*MachineImageVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_MachineImageVersion_To_v1alpha1_MachineImageVersion(a.(*onmetal.MachineImageVersion), b.(*MachineImageVersion), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*MachineImages)(nil), (*onmetal.MachineImages)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_MachineImages_To_onmetal_MachineImages(a.(*MachineImages), b.(*onmetal.MachineImages), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.MachineImages)(nil), (*MachineImages)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_MachineImages_To_v1alpha1_MachineImages(a.(*onmetal.MachineImages), b.(*MachineImages), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*RegionConfig)(nil), (*onmetal.RegionConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_RegionConfig_To_onmetal_RegionConfig(a.(*RegionConfig), b.(*onmetal.RegionConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.RegionConfig)(nil), (*RegionConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_RegionConfig_To_v1alpha1_RegionConfig(a.(*onmetal.RegionConfig), b.(*RegionConfig), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*StorageClass)(nil), (*onmetal.StorageClass)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_StorageClass_To_onmetal_StorageClass(a.(*StorageClass), b.(*onmetal.StorageClass), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.StorageClass)(nil), (*StorageClass)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_StorageClass_To_v1alpha1_StorageClass(a.(*onmetal.StorageClass), b.(*StorageClass), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*StorageClasses)(nil), (*onmetal.StorageClasses)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_StorageClasses_To_onmetal_StorageClasses(a.(*StorageClasses), b.(*onmetal.StorageClasses), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.StorageClasses)(nil), (*StorageClasses)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_StorageClasses_To_v1alpha1_StorageClasses(a.(*onmetal.StorageClasses), b.(*StorageClasses), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*WorkerStatus)(nil), (*onmetal.WorkerStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_WorkerStatus_To_onmetal_WorkerStatus(a.(*WorkerStatus), b.(*onmetal.WorkerStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*onmetal.WorkerStatus)(nil), (*WorkerStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_onmetal_WorkerStatus_To_v1alpha1_WorkerStatus(a.(*onmetal.WorkerStatus), b.(*WorkerStatus), scope) - }); err != nil { - return err - } - return nil -} - -func autoConvert_v1alpha1_CloudControllerManagerConfig_To_onmetal_CloudControllerManagerConfig(in *CloudControllerManagerConfig, out *onmetal.CloudControllerManagerConfig, s conversion.Scope) error { - out.FeatureGates = *(*map[string]bool)(unsafe.Pointer(&in.FeatureGates)) - return nil -} - -// Convert_v1alpha1_CloudControllerManagerConfig_To_onmetal_CloudControllerManagerConfig is an autogenerated conversion function. -func Convert_v1alpha1_CloudControllerManagerConfig_To_onmetal_CloudControllerManagerConfig(in *CloudControllerManagerConfig, out *onmetal.CloudControllerManagerConfig, s conversion.Scope) error { - return autoConvert_v1alpha1_CloudControllerManagerConfig_To_onmetal_CloudControllerManagerConfig(in, out, s) -} - -func autoConvert_onmetal_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig(in *onmetal.CloudControllerManagerConfig, out *CloudControllerManagerConfig, s conversion.Scope) error { - out.FeatureGates = *(*map[string]bool)(unsafe.Pointer(&in.FeatureGates)) - return nil -} - -// Convert_onmetal_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig is an autogenerated conversion function. -func Convert_onmetal_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig(in *onmetal.CloudControllerManagerConfig, out *CloudControllerManagerConfig, s conversion.Scope) error { - return autoConvert_onmetal_CloudControllerManagerConfig_To_v1alpha1_CloudControllerManagerConfig(in, out, s) -} - -func autoConvert_v1alpha1_CloudProfileConfig_To_onmetal_CloudProfileConfig(in *CloudProfileConfig, out *onmetal.CloudProfileConfig, s conversion.Scope) error { - out.MachineImages = *(*[]onmetal.MachineImages)(unsafe.Pointer(&in.MachineImages)) - out.RegionConfigs = *(*[]onmetal.RegionConfig)(unsafe.Pointer(&in.RegionConfigs)) - if err := Convert_v1alpha1_StorageClasses_To_onmetal_StorageClasses(&in.StorageClasses, &out.StorageClasses, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_CloudProfileConfig_To_onmetal_CloudProfileConfig is an autogenerated conversion function. -func Convert_v1alpha1_CloudProfileConfig_To_onmetal_CloudProfileConfig(in *CloudProfileConfig, out *onmetal.CloudProfileConfig, s conversion.Scope) error { - return autoConvert_v1alpha1_CloudProfileConfig_To_onmetal_CloudProfileConfig(in, out, s) -} - -func autoConvert_onmetal_CloudProfileConfig_To_v1alpha1_CloudProfileConfig(in *onmetal.CloudProfileConfig, out *CloudProfileConfig, s conversion.Scope) error { - out.MachineImages = *(*[]MachineImages)(unsafe.Pointer(&in.MachineImages)) - out.RegionConfigs = *(*[]RegionConfig)(unsafe.Pointer(&in.RegionConfigs)) - if err := Convert_onmetal_StorageClasses_To_v1alpha1_StorageClasses(&in.StorageClasses, &out.StorageClasses, s); err != nil { - return err - } - return nil -} - -// Convert_onmetal_CloudProfileConfig_To_v1alpha1_CloudProfileConfig is an autogenerated conversion function. -func Convert_onmetal_CloudProfileConfig_To_v1alpha1_CloudProfileConfig(in *onmetal.CloudProfileConfig, out *CloudProfileConfig, s conversion.Scope) error { - return autoConvert_onmetal_CloudProfileConfig_To_v1alpha1_CloudProfileConfig(in, out, s) -} - -func autoConvert_v1alpha1_ControlPlaneConfig_To_onmetal_ControlPlaneConfig(in *ControlPlaneConfig, out *onmetal.ControlPlaneConfig, s conversion.Scope) error { - out.CloudControllerManager = (*onmetal.CloudControllerManagerConfig)(unsafe.Pointer(in.CloudControllerManager)) - return nil -} - -// Convert_v1alpha1_ControlPlaneConfig_To_onmetal_ControlPlaneConfig is an autogenerated conversion function. -func Convert_v1alpha1_ControlPlaneConfig_To_onmetal_ControlPlaneConfig(in *ControlPlaneConfig, out *onmetal.ControlPlaneConfig, s conversion.Scope) error { - return autoConvert_v1alpha1_ControlPlaneConfig_To_onmetal_ControlPlaneConfig(in, out, s) -} - -func autoConvert_onmetal_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig(in *onmetal.ControlPlaneConfig, out *ControlPlaneConfig, s conversion.Scope) error { - out.CloudControllerManager = (*CloudControllerManagerConfig)(unsafe.Pointer(in.CloudControllerManager)) - return nil -} - -// Convert_onmetal_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig is an autogenerated conversion function. -func Convert_onmetal_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig(in *onmetal.ControlPlaneConfig, out *ControlPlaneConfig, s conversion.Scope) error { - return autoConvert_onmetal_ControlPlaneConfig_To_v1alpha1_ControlPlaneConfig(in, out, s) -} - -func autoConvert_v1alpha1_InfrastructureConfig_To_onmetal_InfrastructureConfig(in *InfrastructureConfig, out *onmetal.InfrastructureConfig, s conversion.Scope) error { - out.NetworkRef = (*v1.LocalObjectReference)(unsafe.Pointer(in.NetworkRef)) - return nil -} - -// Convert_v1alpha1_InfrastructureConfig_To_onmetal_InfrastructureConfig is an autogenerated conversion function. -func Convert_v1alpha1_InfrastructureConfig_To_onmetal_InfrastructureConfig(in *InfrastructureConfig, out *onmetal.InfrastructureConfig, s conversion.Scope) error { - return autoConvert_v1alpha1_InfrastructureConfig_To_onmetal_InfrastructureConfig(in, out, s) -} - -func autoConvert_onmetal_InfrastructureConfig_To_v1alpha1_InfrastructureConfig(in *onmetal.InfrastructureConfig, out *InfrastructureConfig, s conversion.Scope) error { - out.NetworkRef = (*v1.LocalObjectReference)(unsafe.Pointer(in.NetworkRef)) - return nil -} - -// Convert_onmetal_InfrastructureConfig_To_v1alpha1_InfrastructureConfig is an autogenerated conversion function. -func Convert_onmetal_InfrastructureConfig_To_v1alpha1_InfrastructureConfig(in *onmetal.InfrastructureConfig, out *InfrastructureConfig, s conversion.Scope) error { - return autoConvert_onmetal_InfrastructureConfig_To_v1alpha1_InfrastructureConfig(in, out, s) -} - -func autoConvert_v1alpha1_InfrastructureStatus_To_onmetal_InfrastructureStatus(in *InfrastructureStatus, out *onmetal.InfrastructureStatus, s conversion.Scope) error { - out.NetworkRef = in.NetworkRef - out.NATGatewayRef = in.NATGatewayRef - out.PrefixRef = in.PrefixRef - return nil -} - -// Convert_v1alpha1_InfrastructureStatus_To_onmetal_InfrastructureStatus is an autogenerated conversion function. -func Convert_v1alpha1_InfrastructureStatus_To_onmetal_InfrastructureStatus(in *InfrastructureStatus, out *onmetal.InfrastructureStatus, s conversion.Scope) error { - return autoConvert_v1alpha1_InfrastructureStatus_To_onmetal_InfrastructureStatus(in, out, s) -} - -func autoConvert_onmetal_InfrastructureStatus_To_v1alpha1_InfrastructureStatus(in *onmetal.InfrastructureStatus, out *InfrastructureStatus, s conversion.Scope) error { - out.NetworkRef = in.NetworkRef - out.NATGatewayRef = in.NATGatewayRef - out.PrefixRef = in.PrefixRef - return nil -} - -// Convert_onmetal_InfrastructureStatus_To_v1alpha1_InfrastructureStatus is an autogenerated conversion function. -func Convert_onmetal_InfrastructureStatus_To_v1alpha1_InfrastructureStatus(in *onmetal.InfrastructureStatus, out *InfrastructureStatus, s conversion.Scope) error { - return autoConvert_onmetal_InfrastructureStatus_To_v1alpha1_InfrastructureStatus(in, out, s) -} - -func autoConvert_v1alpha1_MachineImage_To_onmetal_MachineImage(in *MachineImage, out *onmetal.MachineImage, s conversion.Scope) error { - out.Name = in.Name - out.Version = in.Version - out.Image = in.Image - out.Architecture = (*string)(unsafe.Pointer(in.Architecture)) - return nil -} - -// Convert_v1alpha1_MachineImage_To_onmetal_MachineImage is an autogenerated conversion function. -func Convert_v1alpha1_MachineImage_To_onmetal_MachineImage(in *MachineImage, out *onmetal.MachineImage, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineImage_To_onmetal_MachineImage(in, out, s) -} - -func autoConvert_onmetal_MachineImage_To_v1alpha1_MachineImage(in *onmetal.MachineImage, out *MachineImage, s conversion.Scope) error { - out.Name = in.Name - out.Version = in.Version - out.Image = in.Image - out.Architecture = (*string)(unsafe.Pointer(in.Architecture)) - return nil -} - -// Convert_onmetal_MachineImage_To_v1alpha1_MachineImage is an autogenerated conversion function. -func Convert_onmetal_MachineImage_To_v1alpha1_MachineImage(in *onmetal.MachineImage, out *MachineImage, s conversion.Scope) error { - return autoConvert_onmetal_MachineImage_To_v1alpha1_MachineImage(in, out, s) -} - -func autoConvert_v1alpha1_MachineImageVersion_To_onmetal_MachineImageVersion(in *MachineImageVersion, out *onmetal.MachineImageVersion, s conversion.Scope) error { - out.Version = in.Version - out.Image = in.Image - out.Architecture = (*string)(unsafe.Pointer(in.Architecture)) - return nil -} - -// Convert_v1alpha1_MachineImageVersion_To_onmetal_MachineImageVersion is an autogenerated conversion function. -func Convert_v1alpha1_MachineImageVersion_To_onmetal_MachineImageVersion(in *MachineImageVersion, out *onmetal.MachineImageVersion, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineImageVersion_To_onmetal_MachineImageVersion(in, out, s) -} - -func autoConvert_onmetal_MachineImageVersion_To_v1alpha1_MachineImageVersion(in *onmetal.MachineImageVersion, out *MachineImageVersion, s conversion.Scope) error { - out.Version = in.Version - out.Image = in.Image - out.Architecture = (*string)(unsafe.Pointer(in.Architecture)) - return nil -} - -// Convert_onmetal_MachineImageVersion_To_v1alpha1_MachineImageVersion is an autogenerated conversion function. -func Convert_onmetal_MachineImageVersion_To_v1alpha1_MachineImageVersion(in *onmetal.MachineImageVersion, out *MachineImageVersion, s conversion.Scope) error { - return autoConvert_onmetal_MachineImageVersion_To_v1alpha1_MachineImageVersion(in, out, s) -} - -func autoConvert_v1alpha1_MachineImages_To_onmetal_MachineImages(in *MachineImages, out *onmetal.MachineImages, s conversion.Scope) error { - out.Name = in.Name - out.Versions = *(*[]onmetal.MachineImageVersion)(unsafe.Pointer(&in.Versions)) - return nil -} - -// Convert_v1alpha1_MachineImages_To_onmetal_MachineImages is an autogenerated conversion function. -func Convert_v1alpha1_MachineImages_To_onmetal_MachineImages(in *MachineImages, out *onmetal.MachineImages, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineImages_To_onmetal_MachineImages(in, out, s) -} - -func autoConvert_onmetal_MachineImages_To_v1alpha1_MachineImages(in *onmetal.MachineImages, out *MachineImages, s conversion.Scope) error { - out.Name = in.Name - out.Versions = *(*[]MachineImageVersion)(unsafe.Pointer(&in.Versions)) - return nil -} - -// Convert_onmetal_MachineImages_To_v1alpha1_MachineImages is an autogenerated conversion function. -func Convert_onmetal_MachineImages_To_v1alpha1_MachineImages(in *onmetal.MachineImages, out *MachineImages, s conversion.Scope) error { - return autoConvert_onmetal_MachineImages_To_v1alpha1_MachineImages(in, out, s) -} - -func autoConvert_v1alpha1_RegionConfig_To_onmetal_RegionConfig(in *RegionConfig, out *onmetal.RegionConfig, s conversion.Scope) error { - out.Name = in.Name - out.Server = in.Server - out.CertificateAuthorityData = *(*[]byte)(unsafe.Pointer(&in.CertificateAuthorityData)) - return nil -} - -// Convert_v1alpha1_RegionConfig_To_onmetal_RegionConfig is an autogenerated conversion function. -func Convert_v1alpha1_RegionConfig_To_onmetal_RegionConfig(in *RegionConfig, out *onmetal.RegionConfig, s conversion.Scope) error { - return autoConvert_v1alpha1_RegionConfig_To_onmetal_RegionConfig(in, out, s) -} - -func autoConvert_onmetal_RegionConfig_To_v1alpha1_RegionConfig(in *onmetal.RegionConfig, out *RegionConfig, s conversion.Scope) error { - out.Name = in.Name - out.Server = in.Server - out.CertificateAuthorityData = *(*[]byte)(unsafe.Pointer(&in.CertificateAuthorityData)) - return nil -} - -// Convert_onmetal_RegionConfig_To_v1alpha1_RegionConfig is an autogenerated conversion function. -func Convert_onmetal_RegionConfig_To_v1alpha1_RegionConfig(in *onmetal.RegionConfig, out *RegionConfig, s conversion.Scope) error { - return autoConvert_onmetal_RegionConfig_To_v1alpha1_RegionConfig(in, out, s) -} - -func autoConvert_v1alpha1_StorageClass_To_onmetal_StorageClass(in *StorageClass, out *onmetal.StorageClass, s conversion.Scope) error { - out.Name = in.Name - out.Type = in.Type - return nil -} - -// Convert_v1alpha1_StorageClass_To_onmetal_StorageClass is an autogenerated conversion function. -func Convert_v1alpha1_StorageClass_To_onmetal_StorageClass(in *StorageClass, out *onmetal.StorageClass, s conversion.Scope) error { - return autoConvert_v1alpha1_StorageClass_To_onmetal_StorageClass(in, out, s) -} - -func autoConvert_onmetal_StorageClass_To_v1alpha1_StorageClass(in *onmetal.StorageClass, out *StorageClass, s conversion.Scope) error { - out.Name = in.Name - out.Type = in.Type - return nil -} - -// Convert_onmetal_StorageClass_To_v1alpha1_StorageClass is an autogenerated conversion function. -func Convert_onmetal_StorageClass_To_v1alpha1_StorageClass(in *onmetal.StorageClass, out *StorageClass, s conversion.Scope) error { - return autoConvert_onmetal_StorageClass_To_v1alpha1_StorageClass(in, out, s) -} - -func autoConvert_v1alpha1_StorageClasses_To_onmetal_StorageClasses(in *StorageClasses, out *onmetal.StorageClasses, s conversion.Scope) error { - out.Default = (*onmetal.StorageClass)(unsafe.Pointer(in.Default)) - out.Additional = *(*[]onmetal.StorageClass)(unsafe.Pointer(&in.Additional)) - return nil -} - -// Convert_v1alpha1_StorageClasses_To_onmetal_StorageClasses is an autogenerated conversion function. -func Convert_v1alpha1_StorageClasses_To_onmetal_StorageClasses(in *StorageClasses, out *onmetal.StorageClasses, s conversion.Scope) error { - return autoConvert_v1alpha1_StorageClasses_To_onmetal_StorageClasses(in, out, s) -} - -func autoConvert_onmetal_StorageClasses_To_v1alpha1_StorageClasses(in *onmetal.StorageClasses, out *StorageClasses, s conversion.Scope) error { - out.Default = (*StorageClass)(unsafe.Pointer(in.Default)) - out.Additional = *(*[]StorageClass)(unsafe.Pointer(&in.Additional)) - return nil -} - -// Convert_onmetal_StorageClasses_To_v1alpha1_StorageClasses is an autogenerated conversion function. -func Convert_onmetal_StorageClasses_To_v1alpha1_StorageClasses(in *onmetal.StorageClasses, out *StorageClasses, s conversion.Scope) error { - return autoConvert_onmetal_StorageClasses_To_v1alpha1_StorageClasses(in, out, s) -} - -func autoConvert_v1alpha1_WorkerStatus_To_onmetal_WorkerStatus(in *WorkerStatus, out *onmetal.WorkerStatus, s conversion.Scope) error { - out.MachineImages = *(*[]onmetal.MachineImage)(unsafe.Pointer(&in.MachineImages)) - return nil -} - -// Convert_v1alpha1_WorkerStatus_To_onmetal_WorkerStatus is an autogenerated conversion function. -func Convert_v1alpha1_WorkerStatus_To_onmetal_WorkerStatus(in *WorkerStatus, out *onmetal.WorkerStatus, s conversion.Scope) error { - return autoConvert_v1alpha1_WorkerStatus_To_onmetal_WorkerStatus(in, out, s) -} - -func autoConvert_onmetal_WorkerStatus_To_v1alpha1_WorkerStatus(in *onmetal.WorkerStatus, out *WorkerStatus, s conversion.Scope) error { - out.MachineImages = *(*[]MachineImage)(unsafe.Pointer(&in.MachineImages)) - return nil -} - -// Convert_onmetal_WorkerStatus_To_v1alpha1_WorkerStatus is an autogenerated conversion function. -func Convert_onmetal_WorkerStatus_To_v1alpha1_WorkerStatus(in *onmetal.WorkerStatus, out *WorkerStatus, s conversion.Scope) error { - return autoConvert_onmetal_WorkerStatus_To_v1alpha1_WorkerStatus(in, out, s) -} diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go index e41fe0a6..10210f2e 100644 --- a/pkg/cmd/config.go +++ b/pkg/cmd/config.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( healthcheckconfig "github.com/gardener/gardener/extensions/pkg/apis/config" "github.com/spf13/pflag" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - configloader "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config/loader" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + configloader "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config/loader" ) // ConfigOptions are command line options that can be set for config.ControllerConfiguration. diff --git a/pkg/cmd/options.go b/pkg/cmd/options.go index 82c9c391..5292f5b4 100644 --- a/pkg/cmd/options.go +++ b/pkg/cmd/options.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,15 +27,15 @@ import ( extensionscloudproviderwebhook "github.com/gardener/gardener/extensions/pkg/webhook/cloudprovider" webhookcmd "github.com/gardener/gardener/extensions/pkg/webhook/cmd" extensioncontrolplanewebhook "github.com/gardener/gardener/extensions/pkg/webhook/controlplane" - backupbucketcontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/backupbucket" - backupentrycontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/backupentry" - bastioncontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/bastion" - controlplanecontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/controlplane" - healthcheckcontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/healthcheck" - infrastructurecontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/infrastructure" - workercontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/worker" - cloudproviderwebhook "github.com/onmetal/gardener-extension-provider-onmetal/pkg/webhook/cloudprovider" - controlplanewebhook "github.com/onmetal/gardener-extension-provider-onmetal/pkg/webhook/controlplane" + backupbucketcontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/backupbucket" + backupentrycontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/backupentry" + bastioncontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/bastion" + controlplanecontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/controlplane" + healthcheckcontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/healthcheck" + infrastructurecontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/infrastructure" + workercontroller "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/worker" + cloudproviderwebhook "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/webhook/cloudprovider" + controlplanewebhook "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/webhook/controlplane" ) // ControllerSwitchOptions are the controllercmd.SwitchOptions for the provider controllers. diff --git a/pkg/controller/backupbucket/actuator.go b/pkg/controller/backupbucket/actuator.go index 512049d2..6120c604 100644 --- a/pkg/controller/backupbucket/actuator.go +++ b/pkg/controller/backupbucket/actuator.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller/backupbucket" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/go-logr/logr" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -45,9 +45,9 @@ func newActuator(mgr manager.Manager, backupBucketConfig *controllerconfig.Backu func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, backupBucket *extensionsv1alpha1.BackupBucket) error { log.V(2).Info("Reconciling BackupBucket") - onmetalClient, namespace, err := onmetal.GetOnmetalClientAndNamespaceFromSecretRef(ctx, a.client, &backupBucket.Spec.SecretRef) + ironcoreClient, namespace, err := ironcore.GetIroncoreClientAndNamespaceFromSecretRef(ctx, a.client, &backupBucket.Spec.SecretRef) if err != nil { - return fmt.Errorf("failed to get onmetal client and namespace from cloudprovider secret: %w", err) + return fmt.Errorf("failed to get ironcore client and namespace from cloudprovider secret: %w", err) } // If the generated secret in the backupbucket status not exists that means @@ -57,7 +57,7 @@ func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, backupBucket return fmt.Errorf("failed to validate configuration: %w", err) } - if err := a.ensureBackupBucket(ctx, namespace, onmetalClient, backupBucket); err != nil { + if err := a.ensureBackupBucket(ctx, namespace, ironcoreClient, backupBucket); err != nil { return fmt.Errorf("failed to ensure backupbucket: %w", err) } } @@ -67,9 +67,9 @@ func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, backupBucket func (a *actuator) Delete(ctx context.Context, log logr.Logger, backupBucket *extensionsv1alpha1.BackupBucket) error { log.V(2).Info("Deleting BackupBucket") - onmetalClient, namespace, err := onmetal.GetOnmetalClientAndNamespaceFromSecretRef(ctx, a.client, &backupBucket.Spec.SecretRef) + ironcoreClient, namespace, err := ironcore.GetIroncoreClientAndNamespaceFromSecretRef(ctx, a.client, &backupBucket.Spec.SecretRef) if err != nil { - return fmt.Errorf("failed to get onmetal client and namespace from cloudprovider secret: %w", err) + return fmt.Errorf("failed to get ironcore client and namespace from cloudprovider secret: %w", err) } bucket := &storagev1alpha1.Bucket{ @@ -78,7 +78,7 @@ func (a *actuator) Delete(ctx context.Context, log logr.Logger, backupBucket *ex Namespace: namespace, }, } - if err = onmetalClient.Delete(ctx, bucket); err != nil { + if err = ironcoreClient.Delete(ctx, bucket); err != nil { return fmt.Errorf("failed to delete backup bucket: %v", err) } diff --git a/pkg/controller/backupbucket/actuator_test.go b/pkg/controller/backupbucket/actuator_test.go index ff6d9da8..b2032224 100644 --- a/pkg/controller/backupbucket/actuator_test.go +++ b/pkg/controller/backupbucket/actuator_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -49,7 +49,7 @@ var _ = Describe("Backupbucket Reconcile", Ordered, func() { }, Spec: extensionsv1alpha1.BackupBucketSpec{ DefaultSpec: extensionsv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: nil, }, Region: "europe-central", diff --git a/pkg/controller/backupbucket/add.go b/pkg/controller/backupbucket/add.go index 105264eb..a883ee80 100644 --- a/pkg/controller/backupbucket/add.go +++ b/pkg/controller/backupbucket/add.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import ( "context" "github.com/gardener/gardener/extensions/pkg/controller/backupbucket" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/manager" ) @@ -29,7 +29,7 @@ var ( DefaultAddOptions = AddOptions{} ) -// AddOptions are options to apply when adding the onmetal backupbucket controller to the manager. +// AddOptions are options to apply when adding the ironcore backupbucket controller to the manager. type AddOptions struct { // Controller are the controller.Options. Controller controller.Options @@ -46,7 +46,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO Actuator: newActuator(mgr, &opts.BackupBucketConfig), ControllerOptions: opts.Controller, Predicates: backupbucket.DefaultPredicates(opts.IgnoreOperationAnnotation), - Type: onmetal.Type, + Type: ironcore.Type, }) } diff --git a/pkg/controller/backupbucket/backupbucket.go b/pkg/controller/backupbucket/backupbucket.go index ab7886a4..0f0811cd 100644 --- a/pkg/controller/backupbucket/backupbucket.go +++ b/pkg/controller/backupbucket/backupbucket.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" ) const ( @@ -38,8 +38,8 @@ const ( waitBucketActiveSteps = 19 ) -// ensureBackupBucket creates onmetal backupBucket object and returns access to bucket -func (a *actuator) ensureBackupBucket(ctx context.Context, namespace string, onmetalClient client.Client, backupBucket *extensionsv1alpha1.BackupBucket) error { +// ensureBackupBucket creates ironcore backupBucket object and returns access to bucket +func (a *actuator) ensureBackupBucket(ctx context.Context, namespace string, ironcoreClient client.Client, backupBucket *extensionsv1alpha1.BackupBucket) error { bucket := &storagev1alpha1.Bucket{ ObjectMeta: metav1.ObjectMeta{ Name: backupBucket.Name, @@ -51,17 +51,17 @@ func (a *actuator) ensureBackupBucket(ctx context.Context, namespace string, onm }, }, } - //create onmetal bucket - if _, err := controllerutil.CreateOrPatch(ctx, onmetalClient, bucket, nil); err != nil { + //create ironcore bucket + if _, err := controllerutil.CreateOrPatch(ctx, ironcoreClient, bucket, nil); err != nil { return fmt.Errorf("failed to create or patch backup bucket %s: %w", client.ObjectKeyFromObject(bucket), err) } //wait for bucket creation - if err := waitBackupBucketToAvailable(ctx, onmetalClient, bucket); err != nil { + if err := waitBackupBucketToAvailable(ctx, ironcoreClient, bucket); err != nil { return fmt.Errorf("could not determine status of backup bucket %w", err) } accessSecret := &corev1.Secret{} - if err := onmetalClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: bucket.Status.Access.SecretRef.Name}, accessSecret); err != nil { + if err := ironcoreClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: bucket.Status.Access.SecretRef.Name}, accessSecret); err != nil { return fmt.Errorf("failed to get bucket access secret %s: %w", client.ObjectKeyFromObject(accessSecret), err) } //update backupBucket secret @@ -71,7 +71,7 @@ func (a *actuator) ensureBackupBucket(ctx context.Context, namespace string, onm return nil } -func waitBackupBucketToAvailable(ctx context.Context, onmetalClient client.Client, bucket *storagev1alpha1.Bucket) error { +func waitBackupBucketToAvailable(ctx context.Context, ironcoreClient client.Client, bucket *storagev1alpha1.Bucket) error { backoff := wait.Backoff{ Duration: waitBucketInitDelay, Factor: waitBucketFactor, @@ -79,7 +79,7 @@ func waitBackupBucketToAvailable(ctx context.Context, onmetalClient client.Clien } err := wait.ExponentialBackoffWithContext(ctx, backoff, func(ctx context.Context) (bool, error) { - err := onmetalClient.Get(ctx, client.ObjectKey{Namespace: bucket.Namespace, Name: bucket.Name}, bucket) + err := ironcoreClient.Get(ctx, client.ObjectKey{Namespace: bucket.Namespace, Name: bucket.Name}, bucket) if err == nil && bucket.Status.State == storagev1alpha1.BucketStateAvailable && isBucketAccessDetailsAvailable(bucket) { return true, nil } @@ -87,7 +87,7 @@ func waitBackupBucketToAvailable(ctx context.Context, onmetalClient client.Clien }) if wait.Interrupted(err) { - return fmt.Errorf("timeout waiting for the onmetal Bucket %s status: %w", client.ObjectKeyFromObject(bucket), err) + return fmt.Errorf("timeout waiting for the ironcore Bucket %s status: %w", client.ObjectKeyFromObject(bucket), err) } return err @@ -103,20 +103,20 @@ func (a *actuator) patchBackupBucketStatus(ctx context.Context, backupBucket *ex return fmt.Errorf("secret does not contain any data") } - accessKeyID, ok := secretData[onmetal.BucketAccessKeyID] + accessKeyID, ok := secretData[ironcore.BucketAccessKeyID] if !ok { - return fmt.Errorf("missing %q field in secret", onmetal.BucketAccessKeyID) + return fmt.Errorf("missing %q field in secret", ironcore.BucketAccessKeyID) } - secretAccessKey, ok := secretData[onmetal.BucketSecretAccessKey] + secretAccessKey, ok := secretData[ironcore.BucketSecretAccessKey] if !ok { - return fmt.Errorf("missing %q field in secret", onmetal.BucketSecretAccessKey) + return fmt.Errorf("missing %q field in secret", ironcore.BucketSecretAccessKey) } accessSecretData := map[string][]byte{} - accessSecretData[onmetal.AccessKeyID] = []byte(accessKeyID) - accessSecretData[onmetal.SecretAccessKey] = []byte(secretAccessKey) - accessSecretData[onmetal.Endpoint] = []byte(endpoint) + accessSecretData[ironcore.AccessKeyID] = []byte(accessKeyID) + accessSecretData[ironcore.SecretAccessKey] = []byte(secretAccessKey) + accessSecretData[ironcore.Endpoint] = []byte(endpoint) patch := client.MergeFrom(backupBucket.DeepCopy()) diff --git a/pkg/controller/backupbucket/suite_test.go b/pkg/controller/backupbucket/suite_test.go index aea8a0a4..887ec288 100644 --- a/pkg/controller/backupbucket/suite_test.go +++ b/pkg/controller/backupbucket/suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -30,12 +30,12 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/onmetal/controller-utils/buildutils" - "github.com/onmetal/controller-utils/modutils" - corev1alpha1 "github.com/onmetal/onmetal-api/api/core/v1alpha1" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" - utilsenvtest "github.com/onmetal/onmetal-api/utils/envtest" - "github.com/onmetal/onmetal-api/utils/envtest/apiserver" + "github.com/ironcore-dev/controller-utils/buildutils" + "github.com/ironcore-dev/controller-utils/modutils" + corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" + utilsenvtest "github.com/ironcore-dev/ironcore/utils/envtest" + "github.com/ironcore-dev/ironcore/utils/envtest/apiserver" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" @@ -46,8 +46,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/manager" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" ) const ( @@ -89,7 +89,7 @@ var _ = BeforeSuite(func() { } testEnvExt = &utilsenvtest.EnvironmentExtensions{ APIServiceDirectoryPaths: []string{ - modutils.Dir("github.com/onmetal/onmetal-api", "config", "apiserver", "apiservice", "bases"), + modutils.Dir("github.com/ironcore-dev/ironcore", "config", "apiserver", "apiservice", "bases"), }, ErrorIfAPIServicePathIsMissing: true, } @@ -113,7 +113,7 @@ var _ = BeforeSuite(func() { komega.SetClient(k8sClient) apiSrv, err := apiserver.New(cfg, apiserver.Options{ - MainPath: "github.com/onmetal/onmetal-api/cmd/onmetal-apiserver", + MainPath: "github.com/ironcore-dev/ironcore/cmd/ironcore-apiserver", BuildOptions: []buildutils.BuildOption{buildutils.ModModeMod}, ETCDServers: []string{testEnv.ControlPlane.Etcd.URL.String()}, Host: testEnvExt.APIServiceInstallOptions.LocalServingHost, diff --git a/pkg/controller/backupentry/actuator.go b/pkg/controller/backupentry/actuator.go index dcba065c..06f6ba9d 100644 --- a/pkg/controller/backupentry/actuator.go +++ b/pkg/controller/backupentry/actuator.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/controller/backupentry/actuator_test.go b/pkg/controller/backupentry/actuator_test.go index cbd4e87e..44e025f1 100644 --- a/pkg/controller/backupentry/actuator_test.go +++ b/pkg/controller/backupentry/actuator_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller/backupentry/genericactuator" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/go-logr/logr" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" @@ -53,7 +53,7 @@ var _ = Describe("BackupEntry Delete", func() { It("should delete Backupentry", func(ctx SpecContext) { - By("creating an Onmetal bucket resource") + By("creating an Ironcore bucket resource") bucketName := "test-bucket" bucket := &storagev1alpha1.Bucket{ ObjectMeta: metav1.ObjectMeta{ @@ -74,7 +74,7 @@ var _ = Describe("BackupEntry Delete", func() { } Expect(k8sClient.Create(ctx, bucket)).Should(Succeed()) - By("creating a secret with credentials data to access onmetal bucket") + By("creating a secret with credentials data to access ironcore bucket") secret := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ Namespace: ns.Name, @@ -89,7 +89,7 @@ var _ = Describe("BackupEntry Delete", func() { Expect(k8sClient.Create(ctx, secret)).To(Succeed()) DeferCleanup(k8sClient.Delete, secret) - By("patching onmetal bucket with available state and credentials secret") + By("patching ironcore bucket with available state and credentials secret") bucketBase := bucket.DeepCopy() bucket.Status.State = storagev1alpha1.BucketStateAvailable bucket.Status.Access = &storagev1alpha1.BucketAccess{ diff --git a/pkg/controller/backupentry/add.go b/pkg/controller/backupentry/add.go index 7ed29609..79b340a9 100644 --- a/pkg/controller/backupentry/add.go +++ b/pkg/controller/backupentry/add.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller/backupentry" "github.com/gardener/gardener/extensions/pkg/controller/backupentry/genericactuator" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/manager" ) @@ -29,7 +29,7 @@ var ( DefaultAddOptions = AddOptions{} ) -// AddOptions are options to apply when adding the onmetal backupentry controller to the manager. +// AddOptions are options to apply when adding the ironcore backupentry controller to the manager. type AddOptions struct { // Controller are the controller.Options. Controller controller.Options @@ -44,7 +44,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO Actuator: genericactuator.NewActuator(mgr, newActuator(mgr)), ControllerOptions: opts.Controller, Predicates: backupentry.DefaultPredicates(opts.IgnoreOperationAnnotation), - Type: onmetal.Type, + Type: ironcore.Type, }) } diff --git a/pkg/controller/backupentry/backupentry.go b/pkg/controller/backupentry/backupentry.go index 9a914c37..f6a76a41 100644 --- a/pkg/controller/backupentry/backupentry.go +++ b/pkg/controller/backupentry/backupentry.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" corev1 "k8s.io/api/core/v1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) //go:generate $MOCKGEN -package backupentry -destination=mock_backupentry.go -source backupentry.go S3ClientGetter,S3ObjectLister @@ -96,19 +96,19 @@ func GetS3ClientFromS3ClientSecret(secret *corev1.Secret) (*s3.S3, error) { return nil, fmt.Errorf("secret does not contain any data") } - accessKeyID, ok := secret.Data[onmetal.AccessKeyID] + accessKeyID, ok := secret.Data[ironcore.AccessKeyID] if !ok { - return nil, fmt.Errorf("missing %q field in secret", onmetal.AccessKeyID) + return nil, fmt.Errorf("missing %q field in secret", ironcore.AccessKeyID) } - secretAccessKey, ok := secret.Data[onmetal.SecretAccessKey] + secretAccessKey, ok := secret.Data[ironcore.SecretAccessKey] if !ok { - return nil, fmt.Errorf("missing %q field in secret", onmetal.SecretAccessKey) + return nil, fmt.Errorf("missing %q field in secret", ironcore.SecretAccessKey) } - endpoint, ok := secret.Data[onmetal.Endpoint] + endpoint, ok := secret.Data[ironcore.Endpoint] if !ok { - return nil, fmt.Errorf("missing %q field in secret", onmetal.Endpoint) + return nil, fmt.Errorf("missing %q field in secret", ironcore.Endpoint) } endpointStr := string(endpoint) diff --git a/pkg/controller/backupentry/suite_test.go b/pkg/controller/backupentry/suite_test.go index ad44cb28..35b731c2 100644 --- a/pkg/controller/backupentry/suite_test.go +++ b/pkg/controller/backupentry/suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -37,12 +37,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/onmetal/controller-utils/buildutils" - "github.com/onmetal/controller-utils/modutils" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" - utilsenvtest "github.com/onmetal/onmetal-api/utils/envtest" - "github.com/onmetal/onmetal-api/utils/envtest/apiserver" + "github.com/ironcore-dev/controller-utils/buildutils" + "github.com/ironcore-dev/controller-utils/modutils" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" + utilsenvtest "github.com/ironcore-dev/ironcore/utils/envtest" + "github.com/ironcore-dev/ironcore/utils/envtest/apiserver" ) const ( @@ -84,7 +84,7 @@ var _ = BeforeSuite(func() { } testEnvExt = &utilsenvtest.EnvironmentExtensions{ APIServiceDirectoryPaths: []string{ - modutils.Dir("github.com/onmetal/onmetal-api", "config", "apiserver", "apiservice", "bases"), + modutils.Dir("github.com/ironcore-dev/ironcore", "config", "apiserver", "apiservice", "bases"), }, ErrorIfAPIServicePathIsMissing: true, } @@ -108,7 +108,7 @@ var _ = BeforeSuite(func() { komega.SetClient(k8sClient) apiSrv, err := apiserver.New(cfg, apiserver.Options{ - MainPath: "github.com/onmetal/onmetal-api/cmd/onmetal-apiserver", + MainPath: "github.com/ironcore-dev/ironcore/cmd/ironcore-apiserver", BuildOptions: []buildutils.BuildOption{buildutils.ModModeMod}, ETCDServers: []string{testEnv.ControlPlane.Etcd.URL.String()}, Host: testEnvExt.APIServiceInstallOptions.LocalServingHost, diff --git a/pkg/controller/bastion/actuator.go b/pkg/controller/bastion/actuator.go index d08c9945..efdb2441 100644 --- a/pkg/controller/bastion/actuator.go +++ b/pkg/controller/bastion/actuator.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package bastion import ( "github.com/gardener/gardener/extensions/pkg/controller/bastion" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/pkg/controller/bastion/actuator_delete.go b/pkg/controller/bastion/actuator_delete.go index b3149a84..397b38f6 100644 --- a/pkg/controller/bastion/actuator_delete.go +++ b/pkg/controller/bastion/actuator_delete.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,19 +21,18 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/go-logr/logr" - computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" ) // Delete implements bastion.Actuator. func (a *actuator) Delete(ctx context.Context, log logr.Logger, bastion *extensionsv1alpha1.Bastion, cluster *controller.Cluster) error { log.V(2).Info("Deleting bastion host") - onmetalClient, namespace, err := onmetal.GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx, a.client, cluster.ObjectMeta.Name) + ironcoreClient, namespace, err := ironcore.GetIroncoreClientAndNamespaceFromCloudProviderSecret(ctx, a.client, cluster.ObjectMeta.Name) if err != nil { - return fmt.Errorf("failed to get onmetal client and namespace from cloudprovider secret: %w", err) + return fmt.Errorf("failed to get ironcore client and namespace from cloudprovider secret: %w", err) } bastionHostName, err := generateBastionHostResourceName(cluster.ObjectMeta.Name, bastion) @@ -46,7 +45,7 @@ func (a *actuator) Delete(ctx context.Context, log logr.Logger, bastion *extensi Name: bastionHostName, }, } - if err := onmetalClient.Delete(ctx, bastionHost); err != nil { + if err := ironcoreClient.Delete(ctx, bastionHost); err != nil { return fmt.Errorf("failed to delete bastion host: %v", err) } diff --git a/pkg/controller/bastion/actuator_delete_test.go b/pkg/controller/bastion/actuator_delete_test.go index 7feba4ca..c4743335 100644 --- a/pkg/controller/bastion/actuator_delete_test.go +++ b/pkg/controller/bastion/actuator_delete_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,9 +20,10 @@ import ( extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller" gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" - computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" + computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -31,8 +32,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" . "sigs.k8s.io/controller-runtime/pkg/envtest/komega" - - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" ) var _ = Describe("Bastion Host Delete", func() { @@ -51,7 +50,7 @@ var _ = Describe("Bastion Host Delete", func() { }, Spec: extensionsv1alpha1.BastionSpec{ DefaultSpec: extensionsv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: nil, }, UserData: []byte("my-user"), diff --git a/pkg/controller/bastion/actuator_reconcile.go b/pkg/controller/bastion/actuator_reconcile.go index 5441736b..3a502f11 100644 --- a/pkg/controller/bastion/actuator_reconcile.go +++ b/pkg/controller/bastion/actuator_reconcile.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,12 +25,12 @@ import ( extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" reconcilerutils "github.com/gardener/gardener/pkg/controllerutils/reconciler" "github.com/go-logr/logr" - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" - computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1" - corev1alpha1 "github.com/onmetal/onmetal-api/api/core/v1alpha1" - ipamv1alpha1 "github.com/onmetal/onmetal-api/api/ipam/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" + computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" + corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1" + ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -38,10 +38,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - api "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/bastion/ignition" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + api "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/controller/bastion/ignition" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) const ( @@ -82,17 +82,17 @@ func (a *actuator) reconcile(ctx context.Context, log logr.Logger, bastion *exte return fmt.Errorf("failed to get infrastructure status: %w", err) } - onmetalClient, namespace, err := onmetal.GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx, a.client, cluster.ObjectMeta.Name) + ironcoreClient, namespace, err := ironcore.GetIroncoreClientAndNamespaceFromCloudProviderSecret(ctx, a.client, cluster.ObjectMeta.Name) if err != nil { - return fmt.Errorf("failed to get onmetal client and namespace from cloudprovider secret: %w", err) + return fmt.Errorf("failed to get ironcore client and namespace from cloudprovider secret: %w", err) } - machine, err := a.applyMachineAndIgnitionSecret(ctx, namespace, onmetalClient, infraStatus, opt) + machine, err := a.applyMachineAndIgnitionSecret(ctx, namespace, ironcoreClient, infraStatus, opt) if err != nil { return fmt.Errorf("failed to create machine: %w", err) } - if err = ensureNetworkPolicy(ctx, namespace, bastion, onmetalClient, infraStatus, machine); err != nil { + if err = ensureNetworkPolicy(ctx, namespace, bastion, ironcoreClient, infraStatus, machine); err != nil { return fmt.Errorf("failed to create network policy: %w", err) } @@ -159,7 +159,7 @@ func getMachineEndpoints(machine *computev1alpha1.Machine) (*bastionEndpoints, e // bastion host machine. It first sets the owner reference for the ignition // secret to the bastion host machine, to ensure that the secret is garbage // collected when the bastion host is deleted. -func (a *actuator) applyMachineAndIgnitionSecret(ctx context.Context, namespace string, onmetalClient client.Client, infraStatus *api.InfrastructureStatus, opt *Options) (*computev1alpha1.Machine, error) { +func (a *actuator) applyMachineAndIgnitionSecret(ctx context.Context, namespace string, ironcoreClient client.Client, infraStatus *api.InfrastructureStatus, opt *Options) (*computev1alpha1.Machine, error) { ignitionSecret, err := generateIgnitionSecret(namespace, opt) if err != nil { return nil, fmt.Errorf("failed to create ignition secret: %w", err) @@ -167,15 +167,15 @@ func (a *actuator) applyMachineAndIgnitionSecret(ctx context.Context, namespace bastionHost := generateMachine(namespace, a.bastionConfig, infraStatus, opt.BastionInstanceName, ignitionSecret.Name) - if _, err = controllerutil.CreateOrPatch(ctx, onmetalClient, bastionHost, nil); err != nil { + if _, err = controllerutil.CreateOrPatch(ctx, ironcoreClient, bastionHost, nil); err != nil { return nil, fmt.Errorf("failed to create or patch bastion host machine %s: %w", client.ObjectKeyFromObject(bastionHost), err) } - if err := controllerutil.SetOwnerReference(bastionHost, ignitionSecret, onmetalClient.Scheme()); err != nil { + if err := controllerutil.SetOwnerReference(bastionHost, ignitionSecret, ironcoreClient.Scheme()); err != nil { return nil, fmt.Errorf("failed to set owner reference for ignition secret %s: %w", client.ObjectKeyFromObject(ignitionSecret), err) } - if _, err = controllerutil.CreateOrPatch(ctx, onmetalClient, ignitionSecret, nil); err != nil { + if _, err = controllerutil.CreateOrPatch(ctx, ironcoreClient, ignitionSecret, nil); err != nil { return nil, fmt.Errorf("failed to create or patch ignition secret %s for bastion host %s: %w", client.ObjectKeyFromObject(ignitionSecret), client.ObjectKeyFromObject(bastionHost), err) } @@ -327,7 +327,7 @@ func IngressReady(ingress *corev1.LoadBalancerIngress) bool { return ingress != nil && (ingress.Hostname != "" || ingress.IP != "") } -func ensureNetworkPolicy(ctx context.Context, namespace string, bastion *extensionsv1alpha1.Bastion, onmetalClient client.Client, infraStatus *api.InfrastructureStatus, bastionHost *computev1alpha1.Machine) error { +func ensureNetworkPolicy(ctx context.Context, namespace string, bastion *extensionsv1alpha1.Bastion, ironcoreClient client.Client, infraStatus *api.InfrastructureStatus, bastionHost *computev1alpha1.Machine) error { cidrs, err := getBastionIngressCIDR(bastion) if err != nil { return fmt.Errorf("failed to get CIDR from bastion ingress: %w", err) @@ -372,11 +372,11 @@ func ensureNetworkPolicy(ctx context.Context, namespace string, bastion *extensi networkPolicy.Spec.Ingress = append(networkPolicy.Spec.Ingress, ingressRule) } - if err := controllerutil.SetOwnerReference(bastionHost, networkPolicy, onmetalClient.Scheme()); err != nil { + if err := controllerutil.SetOwnerReference(bastionHost, networkPolicy, ironcoreClient.Scheme()); err != nil { return fmt.Errorf("failed to set owner reference for network policy %s: %w", client.ObjectKeyFromObject(networkPolicy), err) } - if _, err = controllerutil.CreateOrPatch(ctx, onmetalClient, networkPolicy, nil); err != nil { + if _, err = controllerutil.CreateOrPatch(ctx, ironcoreClient, networkPolicy, nil); err != nil { return fmt.Errorf("failed to create or patch network policy %s: %w", client.ObjectKeyFromObject(networkPolicy), err) } diff --git a/pkg/controller/bastion/actuator_reconcile_test.go b/pkg/controller/bastion/actuator_reconcile_test.go index c0014b48..a2dde6ff 100644 --- a/pkg/controller/bastion/actuator_reconcile_test.go +++ b/pkg/controller/bastion/actuator_reconcile_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,10 +21,10 @@ import ( gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" - computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1" - corev1alpha1 "github.com/onmetal/onmetal-api/api/core/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" + computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" + corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -34,8 +34,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" . "sigs.k8s.io/controller-runtime/pkg/envtest/komega" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) var _ = Describe("Bastion Host Reconcile", func() { @@ -54,7 +54,7 @@ var _ = Describe("Bastion Host Reconcile", func() { }, Spec: extensionsv1alpha1.BastionSpec{ DefaultSpec: extensionsv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: nil, }, UserData: []byte("abcd"), diff --git a/pkg/controller/bastion/add.go b/pkg/controller/bastion/add.go index e39eafb3..09aef2ce 100644 --- a/pkg/controller/bastion/add.go +++ b/pkg/controller/bastion/add.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,10 +18,11 @@ import ( "context" "github.com/gardener/gardener/extensions/pkg/controller/bastion" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/manager" ) @@ -30,7 +31,7 @@ var ( DefaultAddOptions = AddOptions{} ) -// AddOptions are options to apply when adding the onmetal bastion controller to the manager. +// AddOptions are options to apply when adding the ironcore bastion controller to the manager. type AddOptions struct { // Controller are the controller.Options. Controller controller.Options @@ -48,7 +49,7 @@ func AddToManagerWithOptions(mgr manager.Manager, opts AddOptions) error { ConfigValidator: NewConfigValidator(mgr.GetClient(), log.Log), ControllerOptions: opts.Controller, Predicates: bastion.DefaultPredicates(opts.IgnoreOperationAnnotation), - Type: onmetal.Type, + Type: ironcore.Type, }) } diff --git a/pkg/controller/bastion/configvalidator.go b/pkg/controller/bastion/configvalidator.go index 85df233b..9cc3c372 100644 --- a/pkg/controller/bastion/configvalidator.go +++ b/pkg/controller/bastion/configvalidator.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,16 +23,16 @@ import ( extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/gardener/gardener/pkg/extensions" "github.com/go-logr/logr" - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - api "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/helper" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + api "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/helper" ) -// configValidator implements ConfigValidator for onmetal bastion resources. +// configValidator implements ConfigValidator for ironcore bastion resources. type configValidator struct { client client.Client logger logr.Logger @@ -42,7 +42,7 @@ type configValidator struct { func NewConfigValidator(client client.Client, logger logr.Logger) bastion.ConfigValidator { return &configValidator{ client: client, - logger: logger.WithName("onmetal-bastion-config-validator"), + logger: logger.WithName("ironcore-bastion-config-validator"), } } diff --git a/pkg/controller/bastion/configvalidator_test.go b/pkg/controller/bastion/configvalidator_test.go index acd0bc26..3abc0d01 100644 --- a/pkg/controller/bastion/configvalidator_test.go +++ b/pkg/controller/bastion/configvalidator_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,14 +20,13 @@ import ( gardenerextensionv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/gardener/gardener/pkg/extensions" . "github.com/gardener/gardener/pkg/utils/test/matchers" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" gstruct "github.com/onsi/gomega/gstruct" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/log" - - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" ) var _ = Describe("ConfigValidator", func() { @@ -96,7 +95,7 @@ var _ = Describe("ConfigValidator", func() { Spec: gardenerextensionv1alpha1.BastionSpec{ DefaultSpec: gardenerextensionv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, }, UserData: []byte("abcd"), Ingress: []gardenerextensionv1alpha1.BastionIngressPolicy{{ @@ -121,7 +120,7 @@ var _ = Describe("ConfigValidator", func() { Spec: gardenerextensionv1alpha1.BastionSpec{ DefaultSpec: gardenerextensionv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, }, UserData: []byte("abcd"), Ingress: []gardenerextensionv1alpha1.BastionIngressPolicy{{ @@ -146,7 +145,7 @@ var _ = Describe("ConfigValidator", func() { Spec: gardenerextensionv1alpha1.BastionSpec{ DefaultSpec: gardenerextensionv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, }, UserData: []byte("abcd"), Ingress: []gardenerextensionv1alpha1.BastionIngressPolicy{{ diff --git a/pkg/controller/bastion/ignition/config.go b/pkg/controller/bastion/ignition/config.go index 4440609d..0dac4d3c 100644 --- a/pkg/controller/bastion/ignition/config.go +++ b/pkg/controller/bastion/ignition/config.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/controller/bastion/ignition/template.yaml b/pkg/controller/bastion/ignition/template.yaml index 4f129a3b..0b66b042 100644 --- a/pkg/controller/bastion/ignition/template.yaml +++ b/pkg/controller/bastion/ignition/template.yaml @@ -8,7 +8,7 @@ storage: contents: inline: | {{ .Hostname }} - - path: /var/lib/onmetal-cloud-config/init.sh + - path: /var/lib/ironcore-cloud-config/init.sh overwrite: yes mode: 0755 contents: @@ -22,12 +22,12 @@ systemd: [Unit] Wants=network-online.target After=network-online.target - ConditionPathExists=!/var/lib/onmetal-cloud-config/init.done + ConditionPathExists=!/var/lib/ironcore-cloud-config/init.done [Service] Type=oneshot - ExecStart=/var/lib/onmetal-cloud-config/init.sh - ExecStopPost=touch /var/lib/onmetal-cloud-config/init.done + ExecStart=/var/lib/ironcore-cloud-config/init.sh + ExecStopPost=touch /var/lib/ironcore-cloud-config/init.done Restart=on-failure RestartSec=5 diff --git a/pkg/controller/bastion/options.go b/pkg/controller/bastion/options.go index 04cc810b..f62a2d8f 100644 --- a/pkg/controller/bastion/options.go +++ b/pkg/controller/bastion/options.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ type Options struct { UserData []byte } -// DetermineOptions determines the required information that are required to reconcile a Bastion on onmetal. This +// DetermineOptions determines the required information that are required to reconcile a Bastion on ironcore. This // function does not create any IaaS resources. func DetermineOptions(bastion *extensionsv1alpha1.Bastion, cluster *controller.Cluster) (*Options, error) { clusterName := cluster.ObjectMeta.Name diff --git a/pkg/controller/bastion/suite_test.go b/pkg/controller/bastion/suite_test.go index 5d28713e..571ba982 100644 --- a/pkg/controller/bastion/suite_test.go +++ b/pkg/controller/bastion/suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,16 +25,16 @@ import ( "github.com/gardener/gardener/pkg/apis/core/v1beta1" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" - "github.com/onmetal/controller-utils/buildutils" - "github.com/onmetal/controller-utils/modutils" - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" - computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1" - corev1alpha1 "github.com/onmetal/onmetal-api/api/core/v1alpha1" - ipamv1alpha1 "github.com/onmetal/onmetal-api/api/ipam/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" - utilsenvtest "github.com/onmetal/onmetal-api/utils/envtest" - "github.com/onmetal/onmetal-api/utils/envtest/apiserver" + "github.com/ironcore-dev/controller-utils/buildutils" + "github.com/ironcore-dev/controller-utils/modutils" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" + computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" + corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1" + ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" + utilsenvtest "github.com/ironcore-dev/ironcore/utils/envtest" + "github.com/ironcore-dev/ironcore/utils/envtest/apiserver" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -52,8 +52,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/manager" - controllerconfig "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/config" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" + controllerconfig "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/config" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" ) const ( @@ -96,7 +96,7 @@ var _ = BeforeSuite(func() { } testEnvExt = &utilsenvtest.EnvironmentExtensions{ APIServiceDirectoryPaths: []string{ - modutils.Dir("github.com/onmetal/onmetal-api", "config", "apiserver", "apiservice", "bases"), + modutils.Dir("github.com/ironcore-dev/ironcore", "config", "apiserver", "apiservice", "bases"), }, ErrorIfAPIServicePathIsMissing: true, } @@ -122,7 +122,7 @@ var _ = BeforeSuite(func() { komega.SetClient(k8sClient) apiSrv, err := apiserver.New(cfg, apiserver.Options{ - MainPath: "github.com/onmetal/onmetal-api/cmd/onmetal-apiserver", + MainPath: "github.com/ironcore-dev/ironcore/cmd/ironcore-apiserver", BuildOptions: []buildutils.BuildOption{buildutils.ModModeMod}, ETCDServers: []string{testEnv.ControlPlane.Etcd.URL.String()}, Host: testEnvExt.APIServiceInstallOptions.LocalServingHost, diff --git a/pkg/controller/bastion/utils.go b/pkg/controller/bastion/utils.go index e63bdb53..da09beac 100644 --- a/pkg/controller/bastion/utils.go +++ b/pkg/controller/bastion/utils.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "strings" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" - computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1" + computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" ) // generateBastionHostResourceName returns a unique name for the Bastion host in diff --git a/pkg/controller/controlplane/add.go b/pkg/controller/controlplane/add.go index 9d8e6aac..33672b3a 100644 --- a/pkg/controller/controlplane/add.go +++ b/pkg/controller/controlplane/add.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller/controlplane" "github.com/gardener/gardener/extensions/pkg/controller/controlplane/genericactuator" "github.com/gardener/gardener/extensions/pkg/util" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/internal/imagevector" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/internal/imagevector" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/manager" ) @@ -35,7 +35,7 @@ var ( DefaultAddOptions = AddOptions{} ) -// AddOptions are options to apply when adding the onmetal controlplane controller to the manager. +// AddOptions are options to apply when adding the ironcore controlplane controller to the manager. type AddOptions struct { // Controller are the controller.Options. Controller controller.Options @@ -56,11 +56,11 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO return fmt.Errorf("expected *webhook.DefaultServer, got %T", webhookServer) } - genericActuator, err := genericactuator.NewActuator(mgr, onmetal.ProviderName, + genericActuator, err := genericactuator.NewActuator(mgr, ironcore.ProviderName, secretConfigsFunc, shootAccessSecretsFunc, nil, nil, configChart, controlPlaneChart, controlPlaneShootChart, nil, storageClassChart, nil, NewValuesProvider(mgr), extensionscontroller.ChartRendererFactoryFunc(util.NewChartRendererForShoot), - imagevector.ImageVector(), onmetal.CloudProviderConfigName, nil, opts.WebhookServerNamespace, defaultServer.Options.Port) + imagevector.ImageVector(), ironcore.CloudProviderConfigName, nil, opts.WebhookServerNamespace, defaultServer.Options.Port) if err != nil { return err @@ -70,7 +70,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO Actuator: genericActuator, ControllerOptions: opts.Controller, Predicates: controlplane.DefaultPredicates(ctx, mgr, opts.IgnoreOperationAnnotation), - Type: onmetal.Type, + Type: ironcore.Type, }) } diff --git a/pkg/controller/controlplane/constants.go b/pkg/controller/controlplane/constants.go index 5364be98..df50c283 100644 --- a/pkg/controller/controlplane/constants.go +++ b/pkg/controller/controlplane/constants.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/controller/controlplane/suite_test.go b/pkg/controller/controlplane/suite_test.go index b7661f82..e01b1332 100644 --- a/pkg/controller/controlplane/suite_test.go +++ b/pkg/controller/controlplane/suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -42,13 +42,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/onmetal/controller-utils/buildutils" - "github.com/onmetal/controller-utils/modutils" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" - utilsenvtest "github.com/onmetal/onmetal-api/utils/envtest" - "github.com/onmetal/onmetal-api/utils/envtest/apiserver" + "github.com/ironcore-dev/controller-utils/buildutils" + "github.com/ironcore-dev/controller-utils/modutils" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" + utilsenvtest "github.com/ironcore-dev/ironcore/utils/envtest" + "github.com/ironcore-dev/ironcore/utils/envtest/apiserver" - onmetalextensionv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" + ironcoreextensionv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" ) const ( @@ -93,7 +93,7 @@ var _ = BeforeSuite(func() { testEnvExt = &utilsenvtest.EnvironmentExtensions{ APIServiceDirectoryPaths: []string{ - modutils.Dir("github.com/onmetal/onmetal-api", "config", "apiserver", "apiservice", "bases"), + modutils.Dir("github.com/ironcore-dev/ironcore", "config", "apiserver", "apiservice", "bases"), }, ErrorIfAPIServicePathIsMissing: true, } @@ -104,7 +104,7 @@ var _ = BeforeSuite(func() { DeferCleanup(utilsenvtest.StopWithExtensions, testEnv, testEnvExt) Expect(extensionsv1alpha1.AddToScheme(scheme.Scheme)).To(Succeed()) - Expect(onmetalextensionv1alpha1.AddToScheme(scheme.Scheme)).To(Succeed()) + Expect(ironcoreextensionv1alpha1.AddToScheme(scheme.Scheme)).To(Succeed()) Expect(corev1.AddToScheme(scheme.Scheme)).To(Succeed()) Expect(storagev1alpha1.AddToScheme(scheme.Scheme)).To(Succeed()) @@ -116,7 +116,7 @@ var _ = BeforeSuite(func() { komega.SetClient(k8sClient) apiSrv, err := apiserver.New(cfg, apiserver.Options{ - MainPath: "github.com/onmetal/onmetal-api/cmd/onmetal-apiserver", + MainPath: "github.com/ironcore-dev/ironcore/cmd/ironcore-apiserver", BuildOptions: []buildutils.BuildOption{buildutils.ModModeMod}, ETCDServers: []string{testEnv.ControlPlane.Etcd.URL.String()}, Host: testEnvExt.APIServiceInstallOptions.LocalServingHost, diff --git a/pkg/controller/controlplane/valuesprovider.go b/pkg/controller/controlplane/valuesprovider.go index 0329b3f4..cbd181ad 100644 --- a/pkg/controller/controlplane/valuesprovider.go +++ b/pkg/controller/controlplane/valuesprovider.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -33,10 +33,10 @@ import ( kutil "github.com/gardener/gardener/pkg/utils/kubernetes" secretutils "github.com/gardener/gardener/pkg/utils/secrets" secretsmanager "github.com/gardener/gardener/pkg/utils/secrets/manager" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/internal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/internal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" policyv1beta1 "k8s.io/api/policy/v1beta1" @@ -52,7 +52,7 @@ import ( ) const ( - caNameControlPlane = "ca-" + onmetal.ProviderName + "-controlplane" + caNameControlPlane = "ca-" + ironcore.ProviderName + "-controlplane" cloudControllerManagerDeploymentName = "cloud-controller-manager" cloudControllerManagerServerName = "cloud-controller-manager-server" ) @@ -70,8 +70,8 @@ func secretConfigsFunc(namespace string) []extensionssecretsmanager.SecretConfig { Config: &secretutils.CertificateSecretConfig{ Name: cloudControllerManagerServerName, - CommonName: onmetal.CloudControllerManagerName, - DNSNames: kutil.DNSNamesForService(onmetal.CloudControllerManagerName, namespace), + CommonName: ironcore.CloudControllerManagerName, + DNSNames: kutil.DNSNamesForService(ironcore.CloudControllerManagerName, namespace), CertType: secretutils.ServerCert, SkipPublishingCACertificate: true, }, @@ -83,21 +83,21 @@ func secretConfigsFunc(namespace string) []extensionssecretsmanager.SecretConfig func shootAccessSecretsFunc(namespace string) []*gutil.AccessSecret { return []*gutil.AccessSecret{ gutil.NewShootAccessSecret(cloudControllerManagerDeploymentName, namespace), - gutil.NewShootAccessSecret(onmetal.CSIProvisionerName, namespace), - gutil.NewShootAccessSecret(onmetal.CSIAttacherName, namespace), - gutil.NewShootAccessSecret(onmetal.CSIResizerName, namespace), + gutil.NewShootAccessSecret(ironcore.CSIProvisionerName, namespace), + gutil.NewShootAccessSecret(ironcore.CSIAttacherName, namespace), + gutil.NewShootAccessSecret(ironcore.CSIResizerName, namespace), // TODO: This needs to be fixed!!! // Since the csi controller needs to access the Node resources in the Shoot cluster, // it should use the same ServiceAccount as the csi-driver-node in the Shoot. That way // the correct ClusterRolebindings will be used for both components. - gutil.NewShootAccessSecret(onmetal.CSINodeName, namespace), + gutil.NewShootAccessSecret(ironcore.CSINodeName, namespace), } } var ( configChart = &chart.Chart{ Name: "cloud-provider-config", - Path: filepath.Join(onmetal.InternalChartsPath, "cloud-provider-config"), + Path: filepath.Join(ironcore.InternalChartsPath, "cloud-provider-config"), Objects: []*chart.Object{ {Type: &corev1.ConfigMap{}, Name: internal.CloudProviderSecretName}, }, @@ -105,11 +105,11 @@ var ( controlPlaneChart = &chart.Chart{ Name: "seed-controlplane", - Path: filepath.Join(onmetal.InternalChartsPath, "seed-controlplane"), + Path: filepath.Join(ironcore.InternalChartsPath, "seed-controlplane"), SubCharts: []*chart.Chart{ { - Name: onmetal.CloudControllerManagerName, - Images: []string{onmetal.CloudControllerManagerImageName}, + Name: ironcore.CloudControllerManagerName, + Images: []string{ironcore.CloudControllerManagerImageName}, Objects: []*chart.Object{ {Type: &corev1.Service{}, Name: "cloud-controller-manager"}, {Type: &appsv1.Deployment{}, Name: "cloud-controller-manager"}, @@ -118,19 +118,19 @@ var ( }, }, { - Name: onmetal.CSIControllerName, + Name: ironcore.CSIControllerName, Images: []string{ - onmetal.CSIDriverImageName, - onmetal.CSIProvisionerImageName, - onmetal.CSIAttacherImageName, - onmetal.CSIResizerImageName, - onmetal.CSILivenessProbeImageName, + ironcore.CSIDriverImageName, + ironcore.CSIProvisionerImageName, + ironcore.CSIAttacherImageName, + ironcore.CSIResizerImageName, + ironcore.CSILivenessProbeImageName, }, Objects: []*chart.Object{ // csi-driver-controller - {Type: &appsv1.Deployment{}, Name: onmetal.CSIControllerName}, - {Type: &corev1.ConfigMap{}, Name: onmetal.CSIControllerObservabilityConfigName}, - {Type: &autoscalingv1.VerticalPodAutoscaler{}, Name: onmetal.CSIControllerName + "-vpa"}, + {Type: &appsv1.Deployment{}, Name: ironcore.CSIControllerName}, + {Type: &corev1.ConfigMap{}, Name: ironcore.CSIControllerObservabilityConfigName}, + {Type: &autoscalingv1.VerticalPodAutoscaler{}, Name: ironcore.CSIControllerName + "-vpa"}, }, }, }, @@ -138,49 +138,49 @@ var ( controlPlaneShootChart = &chart.Chart{ Name: "shoot-system-components", - Path: filepath.Join(onmetal.InternalChartsPath, "shoot-system-components"), + Path: filepath.Join(ironcore.InternalChartsPath, "shoot-system-components"), SubCharts: []*chart.Chart{ { Name: "cloud-controller-manager", - Path: filepath.Join(onmetal.InternalChartsPath, "cloud-controller-manager"), + Path: filepath.Join(ironcore.InternalChartsPath, "cloud-controller-manager"), Objects: []*chart.Object{ {Type: &rbacv1.ClusterRole{}, Name: "system:controller:cloud-node-controller"}, {Type: &rbacv1.ClusterRoleBinding{}, Name: "system:controller:cloud-node-controller"}, - {Type: &rbacv1.ClusterRole{}, Name: "onmetal:cloud-provider"}, - {Type: &rbacv1.ClusterRoleBinding{}, Name: "onmetal:cloud-provider"}, + {Type: &rbacv1.ClusterRole{}, Name: "ironcore:cloud-provider"}, + {Type: &rbacv1.ClusterRoleBinding{}, Name: "ironcore:cloud-provider"}, }, }, { - Name: onmetal.CSINodeName, + Name: ironcore.CSINodeName, Images: []string{ - onmetal.CSIDriverImageName, - onmetal.CSINodeDriverRegistrarImageName, - onmetal.CSILivenessProbeImageName, + ironcore.CSIDriverImageName, + ironcore.CSINodeDriverRegistrarImageName, + ironcore.CSILivenessProbeImageName, }, Objects: []*chart.Object{ // csi-driver - {Type: &appsv1.DaemonSet{}, Name: onmetal.CSINodeName}, - {Type: &storagev1.CSIDriver{}, Name: onmetal.CSIStorageProvisioner}, - {Type: &corev1.ServiceAccount{}, Name: onmetal.CSIDriverName}, - {Type: &rbacv1.ClusterRole{}, Name: onmetal.UsernamePrefix + onmetal.CSIDriverName}, - {Type: &rbacv1.ClusterRoleBinding{}, Name: onmetal.UsernamePrefix + onmetal.CSIDriverName}, - {Type: &policyv1beta1.PodSecurityPolicy{}, Name: strings.Replace(onmetal.UsernamePrefix+onmetal.CSIDriverName, ":", ".", -1)}, - {Type: extensionscontroller.GetVerticalPodAutoscalerObject(), Name: onmetal.CSINodeName}, + {Type: &appsv1.DaemonSet{}, Name: ironcore.CSINodeName}, + {Type: &storagev1.CSIDriver{}, Name: ironcore.CSIStorageProvisioner}, + {Type: &corev1.ServiceAccount{}, Name: ironcore.CSIDriverName}, + {Type: &rbacv1.ClusterRole{}, Name: ironcore.UsernamePrefix + ironcore.CSIDriverName}, + {Type: &rbacv1.ClusterRoleBinding{}, Name: ironcore.UsernamePrefix + ironcore.CSIDriverName}, + {Type: &policyv1beta1.PodSecurityPolicy{}, Name: strings.Replace(ironcore.UsernamePrefix+ironcore.CSIDriverName, ":", ".", -1)}, + {Type: extensionscontroller.GetVerticalPodAutoscalerObject(), Name: ironcore.CSINodeName}, // csi-provisioner - {Type: &rbacv1.ClusterRole{}, Name: onmetal.UsernamePrefix + onmetal.CSIProvisionerName}, - {Type: &rbacv1.ClusterRoleBinding{}, Name: onmetal.UsernamePrefix + onmetal.CSIProvisionerName}, - {Type: &rbacv1.Role{}, Name: onmetal.UsernamePrefix + onmetal.CSIProvisionerName}, - {Type: &rbacv1.RoleBinding{}, Name: onmetal.UsernamePrefix + onmetal.CSIProvisionerName}, + {Type: &rbacv1.ClusterRole{}, Name: ironcore.UsernamePrefix + ironcore.CSIProvisionerName}, + {Type: &rbacv1.ClusterRoleBinding{}, Name: ironcore.UsernamePrefix + ironcore.CSIProvisionerName}, + {Type: &rbacv1.Role{}, Name: ironcore.UsernamePrefix + ironcore.CSIProvisionerName}, + {Type: &rbacv1.RoleBinding{}, Name: ironcore.UsernamePrefix + ironcore.CSIProvisionerName}, // csi-attacher - {Type: &rbacv1.ClusterRole{}, Name: onmetal.UsernamePrefix + onmetal.CSIAttacherName}, - {Type: &rbacv1.ClusterRoleBinding{}, Name: onmetal.UsernamePrefix + onmetal.CSIAttacherName}, - {Type: &rbacv1.Role{}, Name: onmetal.UsernamePrefix + onmetal.CSIAttacherName}, - {Type: &rbacv1.RoleBinding{}, Name: onmetal.UsernamePrefix + onmetal.CSIAttacherName}, + {Type: &rbacv1.ClusterRole{}, Name: ironcore.UsernamePrefix + ironcore.CSIAttacherName}, + {Type: &rbacv1.ClusterRoleBinding{}, Name: ironcore.UsernamePrefix + ironcore.CSIAttacherName}, + {Type: &rbacv1.Role{}, Name: ironcore.UsernamePrefix + ironcore.CSIAttacherName}, + {Type: &rbacv1.RoleBinding{}, Name: ironcore.UsernamePrefix + ironcore.CSIAttacherName}, // csi-resizer - {Type: &rbacv1.ClusterRole{}, Name: onmetal.UsernamePrefix + onmetal.CSIResizerName}, - {Type: &rbacv1.ClusterRoleBinding{}, Name: onmetal.UsernamePrefix + onmetal.CSIResizerName}, - {Type: &rbacv1.Role{}, Name: onmetal.UsernamePrefix + onmetal.CSIResizerName}, - {Type: &rbacv1.RoleBinding{}, Name: onmetal.UsernamePrefix + onmetal.CSIResizerName}, + {Type: &rbacv1.ClusterRole{}, Name: ironcore.UsernamePrefix + ironcore.CSIResizerName}, + {Type: &rbacv1.ClusterRoleBinding{}, Name: ironcore.UsernamePrefix + ironcore.CSIResizerName}, + {Type: &rbacv1.Role{}, Name: ironcore.UsernamePrefix + ironcore.CSIResizerName}, + {Type: &rbacv1.RoleBinding{}, Name: ironcore.UsernamePrefix + ironcore.CSIResizerName}, }, }, }, @@ -188,11 +188,11 @@ var ( storageClassChart = &chart.Chart{ Name: "shoot-storageclasses", - Path: filepath.Join(onmetal.InternalChartsPath, "shoot-storageclasses"), + Path: filepath.Join(ironcore.InternalChartsPath, "shoot-storageclasses"), } ) -// valuesProvider is a ValuesProvider that provides onmetal-specific values for the 2 charts applied by the generic actuator. +// valuesProvider is a ValuesProvider that provides ironcore-specific values for the 2 charts applied by the generic actuator. type valuesProvider struct { client client.Client decoder runtime.Decoder @@ -220,15 +220,15 @@ func (vp *valuesProvider) GetConfigChartValues( cp *extensionsv1alpha1.ControlPlane, cluster *extensionscontroller.Cluster, ) (map[string]interface{}, error) { - infrastructureStatus := &apisonmetal.InfrastructureStatus{} + infrastructureStatus := &apisironcore.InfrastructureStatus{} if _, _, err := vp.decoder.Decode(cp.Spec.InfrastructureProviderStatus.Raw, nil, infrastructureStatus); err != nil { return nil, fmt.Errorf("failed to decode infrastructure status: %w", err) } // Collect config chart values return map[string]interface{}{ - onmetal.NetworkFieldName: infrastructureStatus.NetworkRef.Name, - onmetal.PrefixFieldName: infrastructureStatus.PrefixRef.Name, - onmetal.ClusterFieldName: cluster.ObjectMeta.Name, + ironcore.NetworkFieldName: infrastructureStatus.NetworkRef.Name, + ironcore.PrefixFieldName: infrastructureStatus.PrefixRef.Name, + ironcore.ClusterFieldName: cluster.ObjectMeta.Name, }, nil } @@ -244,7 +244,7 @@ func (vp *valuesProvider) GetControlPlaneChartValues( map[string]interface{}, error, ) { - cpConfig := &apisonmetal.ControlPlaneConfig{} + cpConfig := &apisironcore.ControlPlaneConfig{} if cp.Spec.ProviderConfig != nil { if _, _, err := vp.decoder.Decode(cp.Spec.ProviderConfig.Raw, nil, cpConfig); err != nil { return nil, fmt.Errorf("could not decode providerConfig of controlplane '%s': %w", kutil.ObjectName(cp), err) @@ -284,7 +284,7 @@ func (vp *valuesProvider) GetStorageClassesChartValues( controlPlane *extensionsv1alpha1.ControlPlane, cluster *extensionscontroller.Cluster, ) (map[string]interface{}, error) { - providerConfig := apisonmetal.CloudProfileConfig{} + providerConfig := apisironcore.CloudProfileConfig{} if config := cluster.CloudProfile.Spec.ProviderConfig; config != nil { if _, _, err := vp.decoder.Decode(config.Raw, nil, &providerConfig); err != nil { return nil, fmt.Errorf("could not decode cloudprofile providerConfig for controlplane '%s': %w", client.ObjectKeyFromObject(controlPlane), err) @@ -297,16 +297,16 @@ func (vp *valuesProvider) GetStorageClassesChartValues( defaultStorageClass++ } - // get onmetal credentials from infrastructure config - onmetalClient, _, err := onmetal.GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx, vp.client, cluster.ObjectMeta.Name) + // get ironcore credentials from infrastructure config + ironcoreClient, _, err := ironcore.GetIroncoreClientAndNamespaceFromCloudProviderSecret(ctx, vp.client, cluster.ObjectMeta.Name) if err != nil { - return nil, fmt.Errorf("failed to get onmetal client and namespace from cloudprovider secret: %w", err) + return nil, fmt.Errorf("failed to get ironcore client and namespace from cloudprovider secret: %w", err) } var expandable bool storageClasses := make([]map[string]interface{}, 0, len(providerConfig.StorageClasses.Additional)+defaultStorageClass) if providerConfig.StorageClasses.Default != nil { - if expandable, err = isVolumeClassExpandable(ctx, onmetalClient, providerConfig.StorageClasses.Default); err != nil { + if expandable, err = isVolumeClassExpandable(ctx, ironcoreClient, providerConfig.StorageClasses.Default); err != nil { return nil, fmt.Errorf("could not get resize policy from volumeclass : %w", err) } @@ -318,7 +318,7 @@ func (vp *valuesProvider) GetStorageClassesChartValues( }) } for _, sc := range providerConfig.StorageClasses.Additional { - if expandable, err = isVolumeClassExpandable(ctx, onmetalClient, &sc); err != nil { + if expandable, err = isVolumeClassExpandable(ctx, ironcoreClient, &sc); err != nil { return nil, fmt.Errorf("could not get resize policy from volumeclass : %w", err) } storageClasses = append(storageClasses, map[string]interface{}{ @@ -333,9 +333,9 @@ func (vp *valuesProvider) GetStorageClassesChartValues( return values, nil } -func isVolumeClassExpandable(ctx context.Context, onmetalClient client.Client, storageClass *apisonmetal.StorageClass) (bool, error) { +func isVolumeClassExpandable(ctx context.Context, ironcoreClient client.Client, storageClass *apisironcore.StorageClass) (bool, error) { volumeClass := &storagev1alpha1.VolumeClass{} - if err := onmetalClient.Get(ctx, client.ObjectKey{Name: storageClass.Type}, volumeClass); err != nil { + if err := ironcoreClient.Get(ctx, client.ObjectKey{Name: storageClass.Type}, volumeClass); err != nil { if apierrors.IsNotFound(err) { return false, fmt.Errorf("VolumeClass not found") } @@ -346,7 +346,7 @@ func isVolumeClassExpandable(ctx context.Context, onmetalClient client.Client, s // getControlPlaneChartValues collects and returns the control plane chart values. func getControlPlaneChartValues( - cpConfig *apisonmetal.ControlPlaneConfig, + cpConfig *apisironcore.ControlPlaneConfig, cp *extensionsv1alpha1.ControlPlane, cluster *extensionscontroller.Cluster, secretsReader secretsmanager.Reader, @@ -370,14 +370,14 @@ func getControlPlaneChartValues( "global": map[string]interface{}{ "genericTokenKubeconfigSecretName": extensionscontroller.GenericTokenKubeconfigSecretNameFromCluster(cluster), }, - onmetal.CloudControllerManagerName: ccm, - onmetal.CSIControllerName: csi, + ironcore.CloudControllerManagerName: ccm, + ironcore.CSIControllerName: csi, }, nil } // getCCMChartValues collects and returns the CCM chart values. func getCCMChartValues( - cpConfig *apisonmetal.ControlPlaneConfig, + cpConfig *apisironcore.ControlPlaneConfig, cp *extensionsv1alpha1.ControlPlane, cluster *extensionscontroller.Cluster, secretsReader secretsmanager.Reader, @@ -452,7 +452,7 @@ func isOverlayEnabled(networking *gardencorev1beta1.Networking) (bool, error) { // getCSIControllerChartValues collects and returns the CSIController chart values. func getCSIControllerChartValues( - _ *apisonmetal.ControlPlaneConfig, + _ *apisironcore.ControlPlaneConfig, _ *extensionsv1alpha1.ControlPlane, cluster *extensionscontroller.Cluster, _ secretsmanager.Reader, @@ -477,8 +477,8 @@ func (vp *valuesProvider) getControlPlaneShootChartValues(cluster *extensionscon } return map[string]interface{}{ - onmetal.CloudControllerManagerName: map[string]interface{}{"enabled": true}, - onmetal.CSINodeName: csiNodeDriverValues, + ironcore.CloudControllerManagerName: map[string]interface{}{"enabled": true}, + ironcore.CSINodeName: csiNodeDriverValues, }, nil } diff --git a/pkg/controller/controlplane/valuesprovider_test.go b/pkg/controller/controlplane/valuesprovider_test.go index cfc440e8..cf25eee7 100644 --- a/pkg/controller/controlplane/valuesprovider_test.go +++ b/pkg/controller/controlplane/valuesprovider_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -38,12 +38,12 @@ import ( fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" . "sigs.k8s.io/controller-runtime/pkg/envtest/komega" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/internal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - "github.com/onmetal/onmetal-api/api/common/v1alpha1" - corev1alpha1 "github.com/onmetal/onmetal-api/api/core/v1alpha1" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/internal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + "github.com/ironcore-dev/ironcore/api/common/v1alpha1" + corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" ) var _ = Describe("Valueprovider Reconcile", func() { @@ -79,10 +79,10 @@ var _ = Describe("Valueprovider Reconcile", func() { Namespace: ns.Name, }, DefaultSpec: extensionsv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: &runtime.RawExtension{ - Raw: encode(&apisonmetal.ControlPlaneConfig{ - CloudControllerManager: &apisonmetal.CloudControllerManagerConfig{ + Raw: encode(&apisironcore.ControlPlaneConfig{ + CloudControllerManager: &apisironcore.CloudControllerManagerConfig{ FeatureGates: map[string]bool{ "CustomResourceValidation": true, }, @@ -91,7 +91,7 @@ var _ = Describe("Valueprovider Reconcile", func() { }, }, InfrastructureProviderStatus: &runtime.RawExtension{ - Raw: encode(&apisonmetal.InfrastructureStatus{ + Raw: encode(&apisironcore.InfrastructureStatus{ NetworkRef: v1alpha1.LocalUIDReference{ Name: "my-network", UID: "1234", @@ -154,7 +154,7 @@ var _ = Describe("Valueprovider Reconcile", func() { DeferCleanup(k8sClient.Delete, volumeClassStatic) }) It("should return an empty config chart value map if not storageclasses are present in the cloudprofile", func(ctx SpecContext) { - providerCloudProfile := &apisonmetal.CloudProfileConfig{} + providerCloudProfile := &apisironcore.CloudProfileConfig{} providerCloudProfileJson, err := json.Marshal(providerCloudProfile) Expect(err).NotTo(HaveOccurred()) @@ -179,13 +179,13 @@ var _ = Describe("Valueprovider Reconcile", func() { }) It("should return correct config chart values if default and additional storage classes are present in the cloudprofile", func(ctx SpecContext) { - providerCloudProfile := &apisonmetal.CloudProfileConfig{ - StorageClasses: apisonmetal.StorageClasses{ - Default: &apisonmetal.StorageClass{ + providerCloudProfile := &apisironcore.CloudProfileConfig{ + StorageClasses: apisironcore.StorageClasses{ + Default: &apisironcore.StorageClass{ Name: "foo", Type: "volume-expandable", }, - Additional: []apisonmetal.StorageClass{ + Additional: []apisironcore.StorageClass{ { Name: "foo1", Type: "volume-expandable", @@ -238,9 +238,9 @@ var _ = Describe("Valueprovider Reconcile", func() { }) It("should return correct config chart values if only additional storage classes are present in the cloudprofile", func(ctx SpecContext) { - providerCloudProfile := &apisonmetal.CloudProfileConfig{ - StorageClasses: apisonmetal.StorageClasses{ - Additional: []apisonmetal.StorageClass{ + providerCloudProfile := &apisironcore.CloudProfileConfig{ + StorageClasses: apisironcore.StorageClasses{ + Additional: []apisironcore.StorageClass{ { Name: "foo1", Type: "volume-expandable", @@ -287,9 +287,9 @@ var _ = Describe("Valueprovider Reconcile", func() { }) It("should return error if volumeClass is not available", func(ctx SpecContext) { - providerCloudProfile := &apisonmetal.CloudProfileConfig{ - StorageClasses: apisonmetal.StorageClasses{ - Default: &apisonmetal.StorageClass{ + providerCloudProfile := &apisironcore.CloudProfileConfig{ + StorageClasses: apisironcore.StorageClasses{ + Default: &apisironcore.StorageClass{ Name: "foo", Type: "volume-non-existing", }, @@ -327,13 +327,13 @@ var _ = Describe("Valueprovider Reconcile", func() { Describe("#GetControlPlaneShootChartValues", func() { It("should return correct config chart values", func(ctx SpecContext) { - providerCloudProfile := &apisonmetal.CloudProfileConfig{ - StorageClasses: apisonmetal.StorageClasses{ - Default: &apisonmetal.StorageClass{ + providerCloudProfile := &apisironcore.CloudProfileConfig{ + StorageClasses: apisironcore.StorageClasses{ + Default: &apisironcore.StorageClass{ Name: "foo", Type: "volume-expandable", }, - Additional: []apisonmetal.StorageClass{ + Additional: []apisironcore.StorageClass{ { Name: "bar", Type: "volume-static", @@ -395,10 +395,10 @@ var _ = Describe("Valueprovider Reconcile", func() { Namespace: ns.Name, }, DefaultSpec: extensionsv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: &runtime.RawExtension{ - Raw: encode(&apisonmetal.ControlPlaneConfig{ - CloudControllerManager: &apisonmetal.CloudControllerManagerConfig{ + Raw: encode(&apisironcore.ControlPlaneConfig{ + CloudControllerManager: &apisironcore.CloudControllerManagerConfig{ FeatureGates: map[string]bool{ "CustomResourceValidation": true, }, @@ -407,7 +407,7 @@ var _ = Describe("Valueprovider Reconcile", func() { }, }, InfrastructureProviderStatus: &runtime.RawExtension{ - Raw: encode(&apisonmetal.InfrastructureStatus{ + Raw: encode(&apisironcore.InfrastructureStatus{ NetworkRef: v1alpha1.LocalUIDReference{ Name: "my-network", UID: "1234", @@ -416,13 +416,13 @@ var _ = Describe("Valueprovider Reconcile", func() { }, }, } - providerCloudProfile := &apisonmetal.CloudProfileConfig{ - StorageClasses: apisonmetal.StorageClasses{ - Default: &apisonmetal.StorageClass{ + providerCloudProfile := &apisironcore.CloudProfileConfig{ + StorageClasses: apisironcore.StorageClasses{ + Default: &apisironcore.StorageClass{ Name: "foo", Type: "volumeTypeFoo", }, - Additional: []apisonmetal.StorageClass{ + Additional: []apisironcore.StorageClass{ { Name: "bar", Type: "volumeTypeBar", @@ -470,7 +470,7 @@ var _ = Describe("Valueprovider Reconcile", func() { } checksums := map[string]string{ - onmetal.CloudProviderConfigName: "8bafb35ff1ac60275d62e1cbd495aceb511fb354f74a20f7d06ecb48b3a68432", + ironcore.CloudProviderConfigName: "8bafb35ff1ac60275d62e1cbd495aceb511fb354f74a20f7d06ecb48b3a68432", } values, err := vp.GetControlPlaneChartValues(ctx, cp, cluster, fakeSecretsManager, checksums, false) Expect(err).NotTo(HaveOccurred()) diff --git a/pkg/controller/healthcheck/add.go b/pkg/controller/healthcheck/add.go index 2e29ab59..a0e76fe0 100644 --- a/pkg/controller/healthcheck/add.go +++ b/pkg/controller/healthcheck/add.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) var ( @@ -55,7 +55,7 @@ var ( // RegisterHealthChecks registers health checks for each extension resource func RegisterHealthChecks(ctx context.Context, mgr manager.Manager, opts healthcheck.DefaultAddArgs) error { if err := healthcheck.DefaultRegistration(ctx, - onmetal.Type, + ironcore.Type, extensionsv1alpha1.SchemeGroupVersion.WithKind(extensionsv1alpha1.ControlPlaneResource), func() client.ObjectList { return &extensionsv1alpha1.ControlPlaneList{} }, func() extensionsv1alpha1.Object { return &extensionsv1alpha1.ControlPlane{} }, @@ -65,11 +65,11 @@ func RegisterHealthChecks(ctx context.Context, mgr manager.Manager, opts healthc []healthcheck.ConditionTypeToHealthCheck{ { ConditionType: string(gardencorev1beta1.ShootControlPlaneHealthy), - HealthCheck: general.NewSeedDeploymentHealthChecker(onmetal.CloudControllerManagerName), + HealthCheck: general.NewSeedDeploymentHealthChecker(ironcore.CloudControllerManagerName), }, { ConditionType: string(gardencorev1beta1.ShootControlPlaneHealthy), - HealthCheck: general.NewSeedDeploymentHealthChecker(onmetal.CSIControllerName), + HealthCheck: general.NewSeedDeploymentHealthChecker(ironcore.CSIControllerName), }, { ConditionType: string(gardencorev1beta1.ShootSystemComponentsHealthy), @@ -96,13 +96,13 @@ func RegisterHealthChecks(ctx context.Context, mgr manager.Manager, opts healthc if !GardenletManagesMCM { workerHealthChecks = append(workerHealthChecks, healthcheck.ConditionTypeToHealthCheck{ ConditionType: string(gardencorev1beta1.ShootControlPlaneHealthy), - HealthCheck: general.NewSeedDeploymentHealthChecker(onmetal.MachineControllerManagerName), + HealthCheck: general.NewSeedDeploymentHealthChecker(ironcore.MachineControllerManagerName), }) workerConditionTypesToRemove = workerConditionTypesToRemove.Delete(gardencorev1beta1.ShootControlPlaneHealthy) } return healthcheck.DefaultRegistration(ctx, - onmetal.Type, + ironcore.Type, extensionsv1alpha1.SchemeGroupVersion.WithKind(extensionsv1alpha1.WorkerResource), func() client.ObjectList { return &extensionsv1alpha1.WorkerList{} }, func() extensionsv1alpha1.Object { return &extensionsv1alpha1.Worker{} }, diff --git a/pkg/controller/infrastructure/actuator.go b/pkg/controller/infrastructure/actuator.go index ebdb6fd3..85c0f37b 100644 --- a/pkg/controller/infrastructure/actuator.go +++ b/pkg/controller/infrastructure/actuator.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/controller/infrastructure/actuator_delete.go b/pkg/controller/infrastructure/actuator_delete.go index b439e2fb..1e409a9b 100644 --- a/pkg/controller/infrastructure/actuator_delete.go +++ b/pkg/controller/infrastructure/actuator_delete.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/go-logr/logr" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - ipamv1alpha1 "github.com/onmetal/onmetal-api/api/ipam/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -32,21 +32,21 @@ import ( func (a *actuator) Delete(ctx context.Context, log logr.Logger, infra *extensionsv1alpha1.Infrastructure, cluster *controller.Cluster) error { log.V(2).Info("Deleting infrastructure") - // get onmetal credentials from infrastructure config - onmetalClient, namespace, err := onmetal.GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx, a.client, cluster.ObjectMeta.Name) + // get ironcore credentials from infrastructure config + ironcoreClient, namespace, err := ironcore.GetIroncoreClientAndNamespaceFromCloudProviderSecret(ctx, a.client, cluster.ObjectMeta.Name) if err != nil { - return fmt.Errorf("failed to get onmetal client and namespace from cloudprovider secret: %w", err) + return fmt.Errorf("failed to get ironcore client and namespace from cloudprovider secret: %w", err) } - if err := a.deletePrefix(ctx, onmetalClient, namespace, cluster); client.IgnoreNotFound(err) != nil { + if err := a.deletePrefix(ctx, ironcoreClient, namespace, cluster); client.IgnoreNotFound(err) != nil { return fmt.Errorf("failed to delete infrastructure: %w", err) } - if err := a.deleteNATGateway(ctx, onmetalClient, namespace, cluster); client.IgnoreNotFound(err) != nil { + if err := a.deleteNATGateway(ctx, ironcoreClient, namespace, cluster); client.IgnoreNotFound(err) != nil { return fmt.Errorf("failed to delete infrastructure: %w", err) } - if err := a.deleteNetwork(ctx, onmetalClient, namespace, cluster); client.IgnoreNotFound(err) != nil { + if err := a.deleteNetwork(ctx, ironcoreClient, namespace, cluster); client.IgnoreNotFound(err) != nil { return fmt.Errorf("failed to delete infrastructure: %w", err) } @@ -54,32 +54,32 @@ func (a *actuator) Delete(ctx context.Context, log logr.Logger, infra *extension return nil } -func (a *actuator) deletePrefix(ctx context.Context, onmetalClient client.Client, namespace string, cluster *controller.Cluster) error { +func (a *actuator) deletePrefix(ctx context.Context, ironcoreClient client.Client, namespace string, cluster *controller.Cluster) error { prefix := &ipamv1alpha1.Prefix{ ObjectMeta: metav1.ObjectMeta{ Namespace: namespace, Name: generateResourceNameFromCluster(cluster), }, } - return onmetalClient.Delete(ctx, prefix) + return ironcoreClient.Delete(ctx, prefix) } -func (a *actuator) deleteNATGateway(ctx context.Context, onmetalClient client.Client, namespace string, cluster *controller.Cluster) error { +func (a *actuator) deleteNATGateway(ctx context.Context, ironcoreClient client.Client, namespace string, cluster *controller.Cluster) error { natGateway := &networkingv1alpha1.NATGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: namespace, Name: generateResourceNameFromCluster(cluster), }, } - return onmetalClient.Delete(ctx, natGateway) + return ironcoreClient.Delete(ctx, natGateway) } -func (a *actuator) deleteNetwork(ctx context.Context, onmetalClient client.Client, namespace string, cluster *controller.Cluster) error { +func (a *actuator) deleteNetwork(ctx context.Context, ironcoreClient client.Client, namespace string, cluster *controller.Cluster) error { network := &networkingv1alpha1.Network{ ObjectMeta: metav1.ObjectMeta{ Namespace: namespace, Name: generateResourceNameFromCluster(cluster), }, } - return onmetalClient.Delete(ctx, network) + return ironcoreClient.Delete(ctx, network) } diff --git a/pkg/controller/infrastructure/actuator_delete_test.go b/pkg/controller/infrastructure/actuator_delete_test.go index 0b861a94..ec2ac47d 100644 --- a/pkg/controller/infrastructure/actuator_delete_test.go +++ b/pkg/controller/infrastructure/actuator_delete_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ import ( extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller" "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - ipamv1alpha1 "github.com/onmetal/onmetal-api/api/ipam/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -52,7 +52,7 @@ var _ = Describe("Infrastructure Reconcile", func() { }, Spec: extensionsv1alpha1.InfrastructureSpec{ DefaultSpec: extensionsv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: &runtime.RawExtension{Object: providerConfig}, }, Region: "foo", diff --git a/pkg/controller/infrastructure/actuator_migrate.go b/pkg/controller/infrastructure/actuator_migrate.go index c9163656..8698a928 100644 --- a/pkg/controller/infrastructure/actuator_migrate.go +++ b/pkg/controller/infrastructure/actuator_migrate.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/controller/infrastructure/actuator_reconcile.go b/pkg/controller/infrastructure/actuator_reconcile.go index 756347ac..43790013 100644 --- a/pkg/controller/infrastructure/actuator_reconcile.go +++ b/pkg/controller/infrastructure/actuator_reconcile.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,13 +21,13 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/go-logr/logr" - api "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/helper" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - "github.com/onmetal/onmetal-api/api/common/v1alpha1" - ipamv1alpha1 "github.com/onmetal/onmetal-api/api/ipam/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" + api "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/helper" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + "github.com/ironcore-dev/ironcore/api/common/v1alpha1" + ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -53,23 +53,23 @@ func (a *actuator) reconcile(ctx context.Context, log logr.Logger, infra *extens return err } - // get onmetal credentials from infrastructure config - onmetalClient, namespace, err := onmetal.GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx, a.client, cluster.ObjectMeta.Name) + // get ironcore credentials from infrastructure config + ironcoreClient, namespace, err := ironcore.GetIroncoreClientAndNamespaceFromCloudProviderSecret(ctx, a.client, cluster.ObjectMeta.Name) if err != nil { - return fmt.Errorf("failed to get onmetal client and namespace from cloudprovider secret: %w", err) + return fmt.Errorf("failed to get ironcore client and namespace from cloudprovider secret: %w", err) } - network, err := a.applyNetwork(ctx, onmetalClient, namespace, config, cluster) + network, err := a.applyNetwork(ctx, ironcoreClient, namespace, config, cluster) if err != nil { return err } - natGateway, err := a.applyNATGateway(ctx, onmetalClient, namespace, cluster, network) + natGateway, err := a.applyNATGateway(ctx, ironcoreClient, namespace, cluster, network) if err != nil { return err } - prefix, err := a.applyPrefix(ctx, onmetalClient, namespace, cluster) + prefix, err := a.applyPrefix(ctx, ironcoreClient, namespace, cluster) if err != nil { return err } @@ -80,11 +80,11 @@ func (a *actuator) reconcile(ctx context.Context, log logr.Logger, infra *extens return a.updateProviderStatus(ctx, infra, network, natGateway, prefix) } -func (a *actuator) applyPrefix(ctx context.Context, onmetalClient client.Client, namespace string, cluster *controller.Cluster) (*ipamv1alpha1.Prefix, error) { +func (a *actuator) applyPrefix(ctx context.Context, ironcoreClient client.Client, namespace string, cluster *controller.Cluster) (*ipamv1alpha1.Prefix, error) { prefix := &ipamv1alpha1.Prefix{ TypeMeta: metav1.TypeMeta{ Kind: "Prefix", - APIVersion: "ipam.api.onmetal.de/v1alpha1", + APIVersion: "ipam.ironcore.dev/v1alpha1", }, ObjectMeta: metav1.ObjectMeta{ Namespace: namespace, @@ -100,18 +100,18 @@ func (a *actuator) applyPrefix(ctx context.Context, onmetalClient client.Client, prefix.Spec.Prefix = v1alpha1.MustParseNewIPPrefix(pointer.StringDeref(nodeCIDR, "")) } - if _, err := controllerutil.CreateOrPatch(ctx, onmetalClient, prefix, nil); err != nil { + if _, err := controllerutil.CreateOrPatch(ctx, ironcoreClient, prefix, nil); err != nil { return nil, fmt.Errorf("failed to apply prefix %s: %w", client.ObjectKeyFromObject(prefix), err) } return prefix, nil } -func (a *actuator) applyNATGateway(ctx context.Context, onmetalClient client.Client, namespace string, cluster *controller.Cluster, network *networkingv1alpha1.Network) (*networkingv1alpha1.NATGateway, error) { +func (a *actuator) applyNATGateway(ctx context.Context, ironcoreClient client.Client, namespace string, cluster *controller.Cluster, network *networkingv1alpha1.Network) (*networkingv1alpha1.NATGateway, error) { natGateway := &networkingv1alpha1.NATGateway{ TypeMeta: metav1.TypeMeta{ Kind: "NATGateway", - APIVersion: "networking.api.onmetal.de/v1alpha1", + APIVersion: "networking.ironcore.dev/v1alpha1", }, ObjectMeta: metav1.ObjectMeta{ Namespace: namespace, @@ -127,17 +127,17 @@ func (a *actuator) applyNATGateway(ctx context.Context, onmetalClient client.Cli }, } - if _, err := controllerutil.CreateOrPatch(ctx, onmetalClient, natGateway, nil); err != nil { + if _, err := controllerutil.CreateOrPatch(ctx, ironcoreClient, natGateway, nil); err != nil { return nil, fmt.Errorf("failed to apply natgateway %s: %w", client.ObjectKeyFromObject(natGateway), err) } return natGateway, nil } -func (a *actuator) applyNetwork(ctx context.Context, onmetalClient client.Client, namespace string, config *api.InfrastructureConfig, cluster *controller.Cluster) (*networkingv1alpha1.Network, error) { +func (a *actuator) applyNetwork(ctx context.Context, ironcoreClient client.Client, namespace string, config *api.InfrastructureConfig, cluster *controller.Cluster) (*networkingv1alpha1.Network, error) { if config != nil && config.NetworkRef != nil { network := &networkingv1alpha1.Network{} networkKey := client.ObjectKey{Namespace: namespace, Name: config.NetworkRef.Name} - if err := onmetalClient.Get(ctx, networkKey, network); err != nil { + if err := ironcoreClient.Get(ctx, networkKey, network); err != nil { return nil, fmt.Errorf("failed to get network %s: %w", networkKey, err) } return network, nil @@ -146,7 +146,7 @@ func (a *actuator) applyNetwork(ctx context.Context, onmetalClient client.Client network := &networkingv1alpha1.Network{ TypeMeta: metav1.TypeMeta{ Kind: "Network", - APIVersion: "networking.api.onmetal.de/v1alpha1", + APIVersion: "networking.ironcore.dev/v1alpha1", }, ObjectMeta: metav1.ObjectMeta{ Namespace: namespace, @@ -154,7 +154,7 @@ func (a *actuator) applyNetwork(ctx context.Context, onmetalClient client.Client }, } - if _, err := controllerutil.CreateOrPatch(ctx, onmetalClient, network, nil); err != nil { + if _, err := controllerutil.CreateOrPatch(ctx, ironcoreClient, network, nil); err != nil { return nil, fmt.Errorf("failed to apply network %s: %w", client.ObjectKeyFromObject(network), err) } return network, nil diff --git a/pkg/controller/infrastructure/actuator_reconcile_test.go b/pkg/controller/infrastructure/actuator_reconcile_test.go index 49603aea..b7e61e98 100644 --- a/pkg/controller/infrastructure/actuator_reconcile_test.go +++ b/pkg/controller/infrastructure/actuator_reconcile_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import ( extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller" "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" - ipamv1alpha1 "github.com/onmetal/onmetal-api/api/ipam/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" + ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -31,8 +31,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" . "sigs.k8s.io/controller-runtime/pkg/envtest/komega" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) var _ = Describe("Infrastructure Reconcile", func() { @@ -62,7 +62,7 @@ var _ = Describe("Infrastructure Reconcile", func() { }, Spec: extensionsv1alpha1.InfrastructureSpec{ DefaultSpec: extensionsv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: &runtime.RawExtension{Object: &v1alpha1.InfrastructureConfig{ TypeMeta: metav1.TypeMeta{ APIVersion: v1alpha1.SchemeGroupVersion.String(), @@ -124,7 +124,7 @@ var _ = Describe("Infrastructure Reconcile", func() { By("ensuring that the infrastructure state contains the correct refs") providerStatus := map[string]interface{}{ - "apiVersion": "onmetal.provider.extensions.gardener.cloud/v1alpha1", + "apiVersion": "ironcore.provider.extensions.gardener.cloud/v1alpha1", "kind": "InfrastructureStatus", "networkRef": map[string]interface{}{ "name": network.Name, @@ -162,7 +162,7 @@ var _ = Describe("Infrastructure Reconcile", func() { }, Spec: extensionsv1alpha1.InfrastructureSpec{ DefaultSpec: extensionsv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: &runtime.RawExtension{Object: &v1alpha1.InfrastructureConfig{}}, }, Region: "foo", @@ -224,7 +224,7 @@ var _ = Describe("Infrastructure Reconcile", func() { By("ensuring that the infrastructure state contains the correct refs") providerStatus := map[string]interface{}{ - "apiVersion": "onmetal.provider.extensions.gardener.cloud/v1alpha1", + "apiVersion": "ironcore.provider.extensions.gardener.cloud/v1alpha1", "kind": "InfrastructureStatus", "networkRef": map[string]interface{}{ "name": network.Name, diff --git a/pkg/controller/infrastructure/actuator_restore.go b/pkg/controller/infrastructure/actuator_restore.go index 72eb7291..33e85cd7 100644 --- a/pkg/controller/infrastructure/actuator_restore.go +++ b/pkg/controller/infrastructure/actuator_restore.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/controller/infrastructure/add.go b/pkg/controller/infrastructure/add.go index 3faaedb6..49eb4429 100644 --- a/pkg/controller/infrastructure/add.go +++ b/pkg/controller/infrastructure/add.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import ( "context" "github.com/gardener/gardener/extensions/pkg/controller/infrastructure" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -29,7 +29,7 @@ var ( DefaultAddOptions = AddOptions{} ) -// AddOptions are options to apply when adding the onmetal infrastructure controller to the manager. +// AddOptions are options to apply when adding the ironcore infrastructure controller to the manager. type AddOptions struct { // Controller are the controller.Options. Controller controller.Options @@ -45,7 +45,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO ConfigValidator: NewConfigValidator(mgr.GetClient(), log.Log), ControllerOptions: opts.Controller, Predicates: infrastructure.DefaultPredicates(ctx, mgr, opts.IgnoreOperationAnnotation), - Type: onmetal.Type, + Type: ironcore.Type, }) } diff --git a/pkg/controller/infrastructure/configvalidator.go b/pkg/controller/infrastructure/configvalidator.go index 72ae2f42..f0614ae2 100644 --- a/pkg/controller/infrastructure/configvalidator.go +++ b/pkg/controller/infrastructure/configvalidator.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,16 +21,16 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller/infrastructure" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/go-logr/logr" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/helper" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/helper" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) -// configValidator implements ConfigValidator for onmetal infrastructure resources. +// configValidator implements ConfigValidator for ironcore infrastructure resources. type configValidator struct { client client.Client logger logr.Logger @@ -40,7 +40,7 @@ type configValidator struct { func NewConfigValidator(client client.Client, logger logr.Logger) infrastructure.ConfigValidator { return &configValidator{ client: client, - logger: logger.WithName("onmetal-infrastructure-config-validator"), + logger: logger.WithName("ironcore-infrastructure-config-validator"), } } @@ -64,21 +64,21 @@ func (c *configValidator) Validate(ctx context.Context, infra *extensionsv1alpha return allErrs } - // get onmetal credentials from infrastructure config - onmetalClient, namespace, err := onmetal.GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx, c.client, infra.Namespace) + // get ironcore credentials from infrastructure config + ironcoreClient, namespace, err := ironcore.GetIroncoreClientAndNamespaceFromCloudProviderSecret(ctx, c.client, infra.Namespace) if err != nil { - allErrs = append(allErrs, field.InternalError(nil, fmt.Errorf("could not get onmetal client and namespace: %w", err))) + allErrs = append(allErrs, field.InternalError(nil, fmt.Errorf("could not get ironcore client and namespace: %w", err))) return allErrs } // ensure that the referenced network exists network := &networkingv1alpha1.Network{} - if err := onmetalClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: config.NetworkRef.Name}, network); err != nil { + if err := ironcoreClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: config.NetworkRef.Name}, network); err != nil { if apierrors.IsNotFound(err) { - allErrs = append(allErrs, field.NotFound(field.NewPath("networkRef"), fmt.Errorf("could not find onmetal network %s: %w", client.ObjectKeyFromObject(network), err))) + allErrs = append(allErrs, field.NotFound(field.NewPath("networkRef"), fmt.Errorf("could not find ironcore network %s: %w", client.ObjectKeyFromObject(network), err))) return allErrs } - allErrs = append(allErrs, field.InternalError(field.NewPath("networkRef"), fmt.Errorf("failed to get onmetal network %s: %w", client.ObjectKeyFromObject(network), err))) + allErrs = append(allErrs, field.InternalError(field.NewPath("networkRef"), fmt.Errorf("failed to get ironcore network %s: %w", client.ObjectKeyFromObject(network), err))) } return allErrs diff --git a/pkg/controller/infrastructure/configvalidator_test.go b/pkg/controller/infrastructure/configvalidator_test.go index 369c7a21..2c8ee878 100644 --- a/pkg/controller/infrastructure/configvalidator_test.go +++ b/pkg/controller/infrastructure/configvalidator_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller/infrastructure" gardenerextensionv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" . "github.com/gardener/gardener/pkg/utils/test/matchers" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) var _ = Describe("ConfigValidator", func() { @@ -74,7 +74,7 @@ var _ = Describe("ConfigValidator", func() { }, Spec: gardenerextensionv1alpha1.InfrastructureSpec{ DefaultSpec: gardenerextensionv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: &runtime.RawExtension{Object: &v1alpha1.InfrastructureConfig{ TypeMeta: metav1.TypeMeta{ APIVersion: v1alpha1.SchemeGroupVersion.String(), @@ -103,7 +103,7 @@ var _ = Describe("ConfigValidator", func() { }, Spec: gardenerextensionv1alpha1.InfrastructureSpec{ DefaultSpec: gardenerextensionv1alpha1.DefaultSpec{ - Type: onmetal.Type, + Type: ironcore.Type, ProviderConfig: &runtime.RawExtension{Object: &v1alpha1.InfrastructureConfig{ TypeMeta: metav1.TypeMeta{ APIVersion: v1alpha1.SchemeGroupVersion.String(), diff --git a/pkg/controller/infrastructure/suite_test.go b/pkg/controller/infrastructure/suite_test.go index c51b5443..02d02885 100644 --- a/pkg/controller/infrastructure/suite_test.go +++ b/pkg/controller/infrastructure/suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,15 +23,15 @@ import ( "github.com/gardener/gardener/pkg/apis/core/v1beta1" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" - "github.com/onmetal/controller-utils/buildutils" - "github.com/onmetal/controller-utils/modutils" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1" - ipamv1alpha1 "github.com/onmetal/onmetal-api/api/ipam/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" - utilsenvtest "github.com/onmetal/onmetal-api/utils/envtest" - "github.com/onmetal/onmetal-api/utils/envtest/apiserver" + "github.com/ironcore-dev/controller-utils/buildutils" + "github.com/ironcore-dev/controller-utils/modutils" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" + ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" + utilsenvtest "github.com/ironcore-dev/ironcore/utils/envtest" + "github.com/ironcore-dev/ironcore/utils/envtest/apiserver" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -88,7 +88,7 @@ var _ = BeforeSuite(func() { } testEnvExt = &utilsenvtest.EnvironmentExtensions{ APIServiceDirectoryPaths: []string{ - modutils.Dir("github.com/onmetal/onmetal-api", "config", "apiserver", "apiservice", "bases"), + modutils.Dir("github.com/ironcore-dev/ironcore", "config", "apiserver", "apiservice", "bases"), }, ErrorIfAPIServicePathIsMissing: true, } @@ -114,7 +114,7 @@ var _ = BeforeSuite(func() { komega.SetClient(k8sClient) apiSrv, err := apiserver.New(cfg, apiserver.Options{ - MainPath: "github.com/onmetal/onmetal-api/cmd/onmetal-apiserver", + MainPath: "github.com/ironcore-dev/ironcore/cmd/ironcore-apiserver", BuildOptions: []buildutils.BuildOption{buildutils.ModModeMod}, ETCDServers: []string{testEnv.ControlPlane.Etcd.URL.String()}, Host: testEnvExt.APIServiceInstallOptions.LocalServingHost, diff --git a/pkg/controller/worker/actuator.go b/pkg/controller/worker/actuator.go index 7eab9451..47b558e4 100644 --- a/pkg/controller/worker/actuator.go +++ b/pkg/controller/worker/actuator.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import ( extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/gardener/gardener/pkg/utils/chart" imagevectorutils "github.com/gardener/gardener/pkg/utils/imagevector" - api "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/helper" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/internal/imagevector" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + api "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/helper" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/internal/imagevector" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes" @@ -60,7 +60,7 @@ func NewActuator(mgr manager.Manager, gardenletManagesMCM bool) (worker.Actuator ) if !gardenletManagesMCM { - mcmName = onmetal.MachineControllerManagerName + mcmName = ironcore.MachineControllerManagerName mcmChartSeed = mcmChart mcmChartShoot = mcmShootChart imageVector = imagevector.ImageVector() diff --git a/pkg/controller/worker/add.go b/pkg/controller/worker/add.go index 2403b12d..8a2228c3 100644 --- a/pkg/controller/worker/add.go +++ b/pkg/controller/worker/add.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller/worker" machinescheme "github.com/gardener/machine-controller-manager/pkg/client/clientset/versioned/scheme" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" "k8s.io/apimachinery/pkg/runtime" "k8s.io/utils/pointer" @@ -34,7 +34,7 @@ var ( } ) -// AddOptions are options to apply when adding the onmetal worker controller to the manager. +// AddOptions are options to apply when adding the ironcore worker controller to the manager. type AddOptions struct { // Controller are the controller.Options. Controller controller.Options @@ -65,7 +65,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO Actuator: actuator, ControllerOptions: opts.Controller, Predicates: worker.DefaultPredicates(ctx, mgr, opts.IgnoreOperationAnnotation), - Type: onmetal.Type, + Type: ironcore.Type, }) } diff --git a/pkg/controller/worker/machine_controller_manager.go b/pkg/controller/worker/machine_controller_manager.go index 2f2796ba..660b2382 100644 --- a/pkg/controller/worker/machine_controller_manager.go +++ b/pkg/controller/worker/machine_controller_manager.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,30 +27,30 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) var ( mcmChart = &chart.Chart{ - Name: onmetal.MachineControllerManagerName, - Path: filepath.Join(onmetal.InternalChartsPath, onmetal.MachineControllerManagerName, "seed"), - Images: []string{onmetal.MachineControllerManagerImageName, onmetal.MachineControllerManagerProviderOnmetalImageName}, + Name: ironcore.MachineControllerManagerName, + Path: filepath.Join(ironcore.InternalChartsPath, ironcore.MachineControllerManagerName, "seed"), + Images: []string{ironcore.MachineControllerManagerImageName, ironcore.MachineControllerManagerProviderIroncoreImageName}, Objects: []*chart.Object{ - {Type: &appsv1.Deployment{}, Name: onmetal.MachineControllerManagerName}, - {Type: &corev1.Service{}, Name: onmetal.MachineControllerManagerName}, - {Type: &corev1.ServiceAccount{}, Name: onmetal.MachineControllerManagerName}, - {Type: &corev1.Secret{}, Name: onmetal.MachineControllerManagerName}, - {Type: extensionscontroller.GetVerticalPodAutoscalerObject(), Name: onmetal.MachineControllerManagerVpaName}, - {Type: &corev1.ConfigMap{}, Name: onmetal.MachineControllerManagerMonitoringConfigName}, + {Type: &appsv1.Deployment{}, Name: ironcore.MachineControllerManagerName}, + {Type: &corev1.Service{}, Name: ironcore.MachineControllerManagerName}, + {Type: &corev1.ServiceAccount{}, Name: ironcore.MachineControllerManagerName}, + {Type: &corev1.Secret{}, Name: ironcore.MachineControllerManagerName}, + {Type: extensionscontroller.GetVerticalPodAutoscalerObject(), Name: ironcore.MachineControllerManagerVpaName}, + {Type: &corev1.ConfigMap{}, Name: ironcore.MachineControllerManagerMonitoringConfigName}, }, } mcmShootChart = &chart.Chart{ - Name: onmetal.MachineControllerManagerName, - Path: filepath.Join(onmetal.InternalChartsPath, onmetal.MachineControllerManagerName, "shoot"), + Name: ironcore.MachineControllerManagerName, + Path: filepath.Join(ironcore.InternalChartsPath, ironcore.MachineControllerManagerName, "shoot"), Objects: []*chart.Object{ - {Type: &rbacv1.ClusterRole{}, Name: fmt.Sprintf("extensions.gardener.cloud:%s:%s", onmetal.ProviderName, onmetal.MachineControllerManagerName)}, - {Type: &rbacv1.ClusterRoleBinding{}, Name: fmt.Sprintf("extensions.gardener.cloud:%s:%s", onmetal.ProviderName, onmetal.MachineControllerManagerName)}, + {Type: &rbacv1.ClusterRole{}, Name: fmt.Sprintf("extensions.gardener.cloud:%s:%s", ironcore.ProviderName, ironcore.MachineControllerManagerName)}, + {Type: &rbacv1.ClusterRoleBinding{}, Name: fmt.Sprintf("extensions.gardener.cloud:%s:%s", ironcore.ProviderName, ironcore.MachineControllerManagerName)}, }, } ) @@ -62,7 +62,7 @@ func (w *workerDelegate) GetMachineControllerManagerChartValues(ctx context.Cont } return map[string]interface{}{ - "providerName": onmetal.ProviderName, + "providerName": ironcore.ProviderName, "namespace": map[string]interface{}{ "uid": namespace.UID, }, @@ -74,6 +74,6 @@ func (w *workerDelegate) GetMachineControllerManagerChartValues(ctx context.Cont func (w *workerDelegate) GetMachineControllerManagerShootChartValues(ctx context.Context) (map[string]interface{}, error) { return map[string]interface{}{ - "providerName": onmetal.ProviderName, + "providerName": ironcore.ProviderName, }, nil } diff --git a/pkg/controller/worker/machine_dependencies.go b/pkg/controller/worker/machine_dependencies.go index 3cbe961a..9a811195 100644 --- a/pkg/controller/worker/machine_dependencies.go +++ b/pkg/controller/worker/machine_dependencies.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/controller/worker/machine_images.go b/pkg/controller/worker/machine_images.go index b00960c1..6ab8e473 100644 --- a/pkg/controller/worker/machine_images.go +++ b/pkg/controller/worker/machine_images.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ import ( "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/client" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal/helper" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore/helper" ) // UpdateMachineImagesStatus updates the machine image status diff --git a/pkg/controller/worker/machine_images_test.go b/pkg/controller/worker/machine_images_test.go index 051a800d..13b70c5a 100644 --- a/pkg/controller/worker/machine_images_test.go +++ b/pkg/controller/worker/machine_images_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ package worker import ( - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -25,7 +25,7 @@ import ( "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/client" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" ) var _ = Describe("MachinesImages", func() { diff --git a/pkg/controller/worker/machines.go b/pkg/controller/worker/machines.go index 2c96a616..f507662f 100644 --- a/pkg/controller/worker/machines.go +++ b/pkg/controller/worker/machines.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -31,11 +31,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - onmetalextensionv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + ironcoreextensionv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) -// MachineClassKind yields the name of the machine class kind used by onmetal provider. +// MachineClassKind yields the name of the machine class kind used by ironcore provider. func (w *workerDelegate) MachineClassKind() string { return "MachineClass" } @@ -50,7 +50,7 @@ func (w *workerDelegate) MachineClassList() client.ObjectList { return &machinecontrollerv1alpha1.MachineClassList{} } -// DeployMachineClasses generates and creates the onmetal specific machine classes. +// DeployMachineClasses generates and creates the ironcore specific machine classes. func (w *workerDelegate) DeployMachineClasses(ctx context.Context) error { machineClasses, machineClassSecrets, err := w.generateMachineClassAndSecrets() if err != nil { @@ -116,7 +116,7 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv machineClassSecrets []*corev1.Secret ) - infrastructureStatus := &onmetalextensionv1alpha1.InfrastructureStatus{} + infrastructureStatus := &ironcoreextensionv1alpha1.InfrastructureStatus{} if _, _, err := w.decoder.Decode(w.worker.Spec.InfrastructureProviderStatus.Raw, nil, infrastructureStatus); err != nil { return nil, nil, fmt.Errorf("failed to decode infra status: %w", err) } @@ -134,13 +134,13 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv } machineClassProviderSpec := map[string]interface{}{ - onmetal.ImageFieldName: machineImage, + ironcore.ImageFieldName: machineImage, } if pool.Volume != nil { - machineClassProviderSpec[onmetal.RootDiskFieldName] = map[string]interface{}{ - onmetal.SizeFieldName: pool.Volume.Size, - onmetal.VolumeClassFieldName: pool.Volume.Type, + machineClassProviderSpec[ironcore.RootDiskFieldName] = map[string]interface{}{ + ironcore.SizeFieldName: pool.Volume.Size, + ironcore.VolumeClassFieldName: pool.Volume.Type, } } @@ -164,10 +164,10 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv } } - machineClassProviderSpec[onmetal.NetworkFieldName] = infrastructureStatus.NetworkRef.Name - machineClassProviderSpec[onmetal.PrefixFieldName] = infrastructureStatus.PrefixRef.Name - machineClassProviderSpec[onmetal.LabelsFieldName] = map[string]string{ - onmetal.ClusterNameLabel: w.cluster.ObjectMeta.Name, + machineClassProviderSpec[ironcore.NetworkFieldName] = infrastructureStatus.NetworkRef.Name + machineClassProviderSpec[ironcore.PrefixFieldName] = infrastructureStatus.PrefixRef.Name + machineClassProviderSpec[ironcore.LabelsFieldName] = map[string]string{ + ironcore.ClusterNameLabel: w.cluster.ObjectMeta.Name, } machineClassProviderSpecJSON, err := json.Marshal(machineClassProviderSpec) @@ -191,7 +191,7 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv ProviderSpec: runtime.RawExtension{ Raw: machineClassProviderSpecJSON, }, - Provider: onmetal.Type, + Provider: ironcore.Type, SecretRef: &corev1.SecretReference{ Name: className, Namespace: w.worker.Namespace, @@ -207,7 +207,7 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv }, }, Data: map[string][]byte{ - onmetal.UserDataFieldName: pool.UserData, + ironcore.UserDataFieldName: pool.UserData, }, } diff --git a/pkg/controller/worker/machines_test.go b/pkg/controller/worker/machines_test.go index 52c57fa2..4a3dcb68 100644 --- a/pkg/controller/worker/machines_test.go +++ b/pkg/controller/worker/machines_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,9 +22,9 @@ import ( genericworkeractuator "github.com/gardener/gardener/extensions/pkg/controller/worker/genericactuator" v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" machinecontrollerv1alpha1 "github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1" - onmetalextensionv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" - commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1" + ironcoreextensionv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" + commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -58,9 +58,9 @@ var _ = Describe("Machines", func() { It("should create the expected machine class for a multi zone cluster", func(ctx SpecContext) { By("defining and setting infrastructure status for worker") - infraStatus := &onmetalextensionv1alpha1.InfrastructureStatus{ + infraStatus := &ironcoreextensionv1alpha1.InfrastructureStatus{ TypeMeta: metav1.TypeMeta{ - APIVersion: onmetalextensionv1alpha1.SchemeGroupVersion.String(), + APIVersion: ironcoreextensionv1alpha1.SchemeGroupVersion.String(), Kind: "InfrastructureStatus", }, NetworkRef: commonv1alpha1.LocalUIDReference{ @@ -107,7 +107,7 @@ var _ = Describe("Machines", func() { "networkName": infraStatus.NetworkRef.Name, "prefixName": infraStatus.PrefixRef.Name, "labels": map[string]interface{}{ - onmetal.ClusterNameLabel: cluster.ObjectMeta.Name, + ironcore.ClusterNameLabel: cluster.ObjectMeta.Name, }, } @@ -121,7 +121,7 @@ var _ = Describe("Machines", func() { Namespace: ns.Name, Name: className, }), - HaveField("Provider", "onmetal"), + HaveField("Provider", "ironcore"), HaveField("NodeTemplate", &machinecontrollerv1alpha1.NodeTemplate{ Capacity: pool.NodeTemplate.Capacity, InstanceType: pool.MachineType, diff --git a/pkg/controller/worker/suite_test.go b/pkg/controller/worker/suite_test.go index 975f377f..b7feabf6 100644 --- a/pkg/controller/worker/suite_test.go +++ b/pkg/controller/worker/suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ import ( gardenerextensionv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" gardener "github.com/gardener/gardener/pkg/client/kubernetes" machinescheme "github.com/gardener/machine-controller-manager/pkg/client/clientset/versioned/scheme" - "github.com/onmetal/controller-utils/modutils" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" - envtestutils "github.com/onmetal/onmetal-api/utils/envtest" + "github.com/ironcore-dev/controller-utils/modutils" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" + envtestutils "github.com/ironcore-dev/ironcore/utils/envtest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/zap/zapcore" @@ -46,7 +46,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" ) const ( @@ -107,7 +107,7 @@ var _ = BeforeSuite(func() { } testEnvExt = &envtestutils.EnvironmentExtensions{ APIServiceDirectoryPaths: []string{ - modutils.Dir("github.com/onmetal/onmetal-api", "config", "apiserver", "apiservice", "bases"), + modutils.Dir("github.com/ironcore-dev/ironcore", "config", "apiserver", "apiservice", "bases"), }, ErrorIfAPIServicePathIsMissing: true, } @@ -214,7 +214,7 @@ func SetupTest() (*corev1.Namespace, *gardener.ChartApplier) { cluster = &extensionscontroller.Cluster{ CloudProfile: &gardencorev1beta1.CloudProfile{ ObjectMeta: metav1.ObjectMeta{ - Name: "onmetal", + Name: "ironcore", }, Spec: gardencorev1beta1.CloudProfileSpec{ ProviderConfig: &runtime.RawExtension{ diff --git a/pkg/internal/imagevector/imagevector.go b/pkg/internal/imagevector/imagevector.go index 3ff7a28c..864d7ed0 100644 --- a/pkg/internal/imagevector/imagevector.go +++ b/pkg/internal/imagevector/imagevector.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import ( "github.com/gardener/gardener/pkg/utils/imagevector" "k8s.io/apimachinery/pkg/util/runtime" - "github.com/onmetal/gardener-extension-provider-onmetal/charts" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/charts" ) var imageVector imagevector.ImageVector diff --git a/pkg/internal/types.go b/pkg/internal/types.go index 29e00385..7234a032 100644 --- a/pkg/internal/types.go +++ b/pkg/internal/types.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/onmetal/clientutils.go b/pkg/ironcore/clientutils.go similarity index 66% rename from pkg/onmetal/clientutils.go rename to pkg/ironcore/clientutils.go index 5ad5ff35..4d542067 100644 --- a/pkg/onmetal/clientutils.go +++ b/pkg/ironcore/clientutils.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore import ( "context" @@ -27,26 +27,26 @@ import ( "k8s.io/client-go/tools/clientcmd" "sigs.k8s.io/controller-runtime/pkg/client" - computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1" - ipamv1alpha1 "github.com/onmetal/onmetal-api/api/ipam/v1alpha1" - networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1" - storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1" + computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" + ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1" + networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1" + storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1" ) -var onmetalScheme = runtime.NewScheme() +var ironcoreScheme = runtime.NewScheme() func init() { - utilruntime.Must(corev1.AddToScheme(onmetalScheme)) - utilruntime.Must(networkingv1alpha1.AddToScheme(onmetalScheme)) - utilruntime.Must(computev1alpha1.AddToScheme(onmetalScheme)) - utilruntime.Must(storagev1alpha1.AddToScheme(onmetalScheme)) - utilruntime.Must(ipamv1alpha1.AddToScheme(onmetalScheme)) - utilruntime.Must(extensionsv1alpha1.AddToScheme(onmetalScheme)) + utilruntime.Must(corev1.AddToScheme(ironcoreScheme)) + utilruntime.Must(networkingv1alpha1.AddToScheme(ironcoreScheme)) + utilruntime.Must(computev1alpha1.AddToScheme(ironcoreScheme)) + utilruntime.Must(storagev1alpha1.AddToScheme(ironcoreScheme)) + utilruntime.Must(ipamv1alpha1.AddToScheme(ironcoreScheme)) + utilruntime.Must(extensionsv1alpha1.AddToScheme(ironcoreScheme)) } -// GetOnmetalClientAndNamespaceFromCloudProviderSecret extracts the from the +// GetIroncoreClientAndNamespaceFromCloudProviderSecret extracts the from the // cloudprovider secret in the Shoot namespace. -func GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx context.Context, cl client.Client, shootNamespace string) (client.Client, string, error) { +func GetIroncoreClientAndNamespaceFromCloudProviderSecret(ctx context.Context, cl client.Client, shootNamespace string) (client.Client, string, error) { secret := &corev1.Secret{} secretKey := client.ObjectKey{Namespace: shootNamespace, Name: v1beta1constants.SecretNameCloudProvider} if err := cl.Get(ctx, secretKey, secret); err != nil { @@ -64,7 +64,7 @@ func GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx context.Context, cl if err != nil { return nil, "", fmt.Errorf("failed to create rest config from cloudprovider secret: %w", err) } - c, err := client.New(clientCfg, client.Options{Scheme: onmetalScheme}) + c, err := client.New(clientCfg, client.Options{Scheme: ironcoreScheme}) if err != nil { return nil, "", fmt.Errorf("failed to create client from cloudprovider secret: %w", err) } @@ -72,9 +72,9 @@ func GetOnmetalClientAndNamespaceFromCloudProviderSecret(ctx context.Context, cl return c, string(namespace), nil } -// GetOnmetalClientAndNamespaceFromSecretRef extracts the from the +// GetIroncoreClientAndNamespaceFromSecretRef extracts the from the // provided secret -func GetOnmetalClientAndNamespaceFromSecretRef(ctx context.Context, cl client.Client, secretRef *corev1.SecretReference) (client.Client, string, error) { +func GetIroncoreClientAndNamespaceFromSecretRef(ctx context.Context, cl client.Client, secretRef *corev1.SecretReference) (client.Client, string, error) { secret, err := extensionscontroller.GetSecretByReference(ctx, cl, secretRef) if err != nil { return nil, "", err @@ -95,7 +95,7 @@ func GetOnmetalClientAndNamespaceFromSecretRef(ctx context.Context, cl client.Cl if err != nil { return nil, "", fmt.Errorf("failed to create rest config from secret: %w", err) } - c, err := client.New(clientCfg, client.Options{Scheme: onmetalScheme}) + c, err := client.New(clientCfg, client.Options{Scheme: ironcoreScheme}) if err != nil { return nil, "", fmt.Errorf("failed to create client from secret: %w", err) } diff --git a/pkg/onmetal/helper/helper.go b/pkg/ironcore/helper/helper.go similarity index 90% rename from pkg/onmetal/helper/helper.go rename to pkg/ironcore/helper/helper.go index d18ebe30..a5fc5270 100644 --- a/pkg/onmetal/helper/helper.go +++ b/pkg/ironcore/helper/helper.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import ( "k8s.io/utils/pointer" - api "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - apiv1alpha1 "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/v1alpha1" + api "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + apiv1alpha1 "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore/v1alpha1" ) // FindMachineImage takes a list of machine images and tries to find the first entry diff --git a/pkg/onmetal/predicate.go b/pkg/ironcore/predicate.go similarity index 79% rename from pkg/onmetal/predicate.go rename to pkg/ironcore/predicate.go index 851ef25c..f9f96e61 100644 --- a/pkg/onmetal/predicate.go +++ b/pkg/ironcore/predicate.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore -// Type is the type of resources managed by the onmetal actuator. -const Type = "onmetal" +// Type is the type of resources managed by the ironcore actuator. +const Type = "ironcore" diff --git a/pkg/onmetal/suite_test.go b/pkg/ironcore/suite_test.go similarity index 93% rename from pkg/onmetal/suite_test.go rename to pkg/ironcore/suite_test.go index 72b6c508..4ba3b535 100644 --- a/pkg/onmetal/suite_test.go +++ b/pkg/ironcore/suite_test.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore import ( "testing" diff --git a/pkg/onmetal/types.go b/pkg/ironcore/types.go similarity index 87% rename from pkg/onmetal/types.go rename to pkg/ironcore/types.go index f3967fa6..14b4e492 100644 --- a/pkg/onmetal/types.go +++ b/pkg/ironcore/types.go @@ -1,4 +1,4 @@ -// Copyright 2022 OnMetal authors +// Copyright 2022 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package onmetal +package ironcore import ( "path/filepath" @@ -21,8 +21,8 @@ import ( ) const ( - // ProviderName is the name of the onmetal provider. - ProviderName = "provider-onmetal" + // ProviderName is the name of the ironcore provider. + ProviderName = "provider-ironcore" // CloudControllerManagerImageName is the name of the cloud-controller-manager image. CloudControllerManagerImageName = "cloud-controller-manager" @@ -40,12 +40,12 @@ const ( CSILivenessProbeImageName = "csi-liveness-probe" // MachineControllerManagerImageName is the name of the MachineControllerManager image. MachineControllerManagerImageName = "machine-controller-manager" - // MachineControllerManagerProviderOnmetalImageName is the name of the MachineController onmetal image. - MachineControllerManagerProviderOnmetalImageName = "machine-controller-manager-provider-onmetal" + // MachineControllerManagerProviderIroncoreImageName is the name of the MachineController ironcore image. + MachineControllerManagerProviderIroncoreImageName = "machine-controller-manager-provider-ironcore" - // AccessKeyID is a constant for the key in a onmetal bucket access secret that holds the Bucket access key id. + // AccessKeyID is a constant for the key in a ironcore bucket access secret that holds the Bucket access key id. BucketAccessKeyID = "AWS_ACCESS_KEY_ID" - // AwsSecretAccessKey is a constant for the key in a onmetal bucket access secret that holds the Bucket secret access key. + // AwsSecretAccessKey is a constant for the key in a ironcore bucket access secret that holds the Bucket secret access key. BucketSecretAccessKey = "AWS_SECRET_ACCESS_KEY" // AccessKeyID is a constant for the key in a cloud provider secret and backup secret that holds the Bucket access key id. AccessKeyID = "accessKeyID" @@ -57,9 +57,9 @@ const ( UsernameFieldName = "username" // NamespaceFieldName is the field in a secret where the namespace is stored at. NamespaceFieldName = "namespace" - // KubeConfigFieldName is containing the effective kubeconfig to access an onmetal cluster. + // KubeConfigFieldName is containing the effective kubeconfig to access an ironcore cluster. KubeConfigFieldName = "kubeconfig" - // TokenFieldName is containing the token to access an onmetal cluster. + // TokenFieldName is containing the token to access an ironcore cluster. TokenFieldName = "token" // NetworkFieldName is the name of network field NetworkFieldName = "networkName" @@ -80,7 +80,7 @@ const ( // VolumeClassFieldName is the name of the volume class field VolumeClassFieldName = "volumeClassName" // ClusterNameLabel is the name is the label key of the cluster name - ClusterNameLabel = "extension.api.onmetal.de/cluster-name" + ClusterNameLabel = "extension.ironcore.dev/cluster-name" // CloudProviderConfigName is the name of the secret containing the cloud provider config. CloudProviderConfigName = "cloud-provider-config" @@ -105,7 +105,7 @@ const ( // CSILivenessProbeName is a constant for the name of the csi-liveness-probe component. CSILivenessProbeName = "csi-liveness-probe" // CSIStorageProvisioner is a constant with the storage provisioner name which is used in storageclasses. - CSIStorageProvisioner = "onmetal-csi-driver" + CSIStorageProvisioner = "ironcore-csi-driver" // MachineControllerManagerName is a constant for the name of the machine-controller-manager. MachineControllerManagerName = "machine-controller-manager" // MachineControllerManagerVpaName is the name of the VerticalPodAutoscaler of the machine-controller-manager deployment. @@ -119,6 +119,6 @@ var ( ChartsPath = filepath.Join("charts") // InternalChartsPath is the path to the internal charts InternalChartsPath = filepath.Join(ChartsPath, "internal") - // UsernamePrefix is a constant for the username prefix of components deployed by onmetal. + // UsernamePrefix is a constant for the username prefix of components deployed by ironcore. UsernamePrefix = extensionsv1alpha1.SchemeGroupVersion.Group + ":" + ProviderName + ":" ) diff --git a/pkg/webhook/cloudprovider/add.go b/pkg/webhook/cloudprovider/add.go index 13675332..f74afcc4 100644 --- a/pkg/webhook/cloudprovider/add.go +++ b/pkg/webhook/cloudprovider/add.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,16 +20,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) -var logger = log.Log.WithName("onmetal-cloudprovider-webhook") +var logger = log.Log.WithName("ironcore-cloudprovider-webhook") // AddToManager creates the cloudprovider webhook and adds it to the manager. func AddToManager(mgr manager.Manager) (*extensionswebhook.Webhook, error) { logger.Info("adding webhook to manager") return cloudprovider.New(mgr, cloudprovider.Args{ - Provider: onmetal.Type, + Provider: ironcore.Type, Mutator: cloudprovider.NewMutator(mgr, logger, NewEnsurer(logger, mgr)), }) } diff --git a/pkg/webhook/cloudprovider/ensurer.go b/pkg/webhook/cloudprovider/ensurer.go index a9a238e5..22b5fafa 100644 --- a/pkg/webhook/cloudprovider/ensurer.go +++ b/pkg/webhook/cloudprovider/ensurer.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import ( "github.com/gardener/gardener/extensions/pkg/webhook/cloudprovider" gcontext "github.com/gardener/gardener/extensions/pkg/webhook/context" "github.com/go-logr/logr" - apisonmetal "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + apisironcore "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" @@ -51,17 +51,17 @@ type ensurer struct { // EnsureCloudProviderSecret ensures that cloudprovider secret contains // the shared credentials file. func (e *ensurer) EnsureCloudProviderSecret(ctx context.Context, gctx gcontext.GardenContext, newCloudProviderSecret, _ *corev1.Secret) error { - token, ok := newCloudProviderSecret.Data[onmetal.TokenFieldName] + token, ok := newCloudProviderSecret.Data[ironcore.TokenFieldName] if !ok { - return fmt.Errorf("could not mutate cloudprovider secret as %q field is missing", onmetal.TokenFieldName) + return fmt.Errorf("could not mutate cloudprovider secret as %q field is missing", ironcore.TokenFieldName) } - namespace, ok := newCloudProviderSecret.Data[onmetal.NamespaceFieldName] + namespace, ok := newCloudProviderSecret.Data[ironcore.NamespaceFieldName] if !ok { - return fmt.Errorf("could not mutate cloudprovider secret as %q field is missing", onmetal.NamespaceFieldName) + return fmt.Errorf("could not mutate cloudprovider secret as %q field is missing", ironcore.NamespaceFieldName) } - username, ok := newCloudProviderSecret.Data[onmetal.UsernameFieldName] + username, ok := newCloudProviderSecret.Data[ironcore.UsernameFieldName] if !ok { - return fmt.Errorf("could not mutate cloud provider secret as %q fied is missing", onmetal.UsernameFieldName) + return fmt.Errorf("could not mutate cloud provider secret as %q fied is missing", ironcore.UsernameFieldName) } cluster, err := gctx.GetCluster(ctx) @@ -69,7 +69,7 @@ func (e *ensurer) EnsureCloudProviderSecret(ctx context.Context, gctx gcontext.G return fmt.Errorf("failed to get cluster: %w", err) } - cloudProfileConfig := &apisonmetal.CloudProfileConfig{} + cloudProfileConfig := &apisironcore.CloudProfileConfig{} raw, err := cluster.CloudProfile.Spec.ProviderConfig.MarshalJSON() if err != nil { return fmt.Errorf("could not decode cluster object's providerConfig: %w", err) @@ -117,6 +117,6 @@ func (e *ensurer) EnsureCloudProviderSecret(ctx context.Context, gctx gcontext.G return fmt.Errorf("failed to encode kubeconfig: %w", err) } - newCloudProviderSecret.Data[onmetal.KubeConfigFieldName] = raw + newCloudProviderSecret.Data[ironcore.KubeConfigFieldName] = raw return nil } diff --git a/pkg/webhook/cloudprovider/ensurer_test.go b/pkg/webhook/cloudprovider/ensurer_test.go index 66db4a10..dd75c275 100644 --- a/pkg/webhook/cloudprovider/ensurer_test.go +++ b/pkg/webhook/cloudprovider/ensurer_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import ( gcontext "github.com/gardener/gardener/extensions/pkg/webhook/context" gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1" mockmanager "github.com/gardener/gardener/pkg/mock/controller-runtime/manager" - api "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal" + api "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/apis/ironcore" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/pkg/webhook/controlplane/add.go b/pkg/webhook/controlplane/add.go index 3c1b7194..26f54c2e 100644 --- a/pkg/webhook/controlplane/add.go +++ b/pkg/webhook/controlplane/add.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) var ( - logger = log.Log.WithName("onmetal-controlplane-webhook") + logger = log.Log.WithName("ironcore-controlplane-webhook") // GardenletManagesMCM specifies whether the machine-controller-manager should be managed. GardenletManagesMCM bool ) @@ -41,7 +41,7 @@ func AddToManager(mgr manager.Manager) (*extensionswebhook.Webhook, error) { fciCodec := oscutils.NewFileContentInlineCodec() return controlplane.New(mgr, controlplane.Args{ Kind: controlplane.KindShoot, - Provider: onmetal.Type, + Provider: ironcore.Type, Types: []extensionswebhook.Type{ {Obj: &appsv1.Deployment{}}, {Obj: &vpaautoscalingv1.VerticalPodAutoscaler{}}, diff --git a/pkg/webhook/controlplane/ensurer.go b/pkg/webhook/controlplane/ensurer.go index 0fe595db..5f5e3f1a 100644 --- a/pkg/webhook/controlplane/ensurer.go +++ b/pkg/webhook/controlplane/ensurer.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ import ( extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/gardener/gardener/pkg/component/machinecontrollermanager" "github.com/go-logr/logr" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/internal/imagevector" - "github.com/onmetal/gardener-extension-provider-onmetal/pkg/onmetal" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/internal/imagevector" + "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -37,7 +37,7 @@ import ( // NewEnsurer creates a new controlplane ensurer. func NewEnsurer(logger logr.Logger, gardenletManagesMCM bool) genericmutator.Ensurer { return &ensurer{ - logger: logger.WithName("onmetal-controlplane-ensurer"), + logger: logger.WithName("ironcore-controlplane-ensurer"), gardenletManagesMCM: gardenletManagesMCM, } } @@ -57,7 +57,7 @@ func (e *ensurer) EnsureMachineControllerManagerDeployment(_ context.Context, _ return nil } - image, err := ImageVector.FindImage(onmetal.MachineControllerManagerProviderOnmetalImageName) + image, err := ImageVector.FindImage(ironcore.MachineControllerManagerProviderIroncoreImageName) if err != nil { return err } @@ -67,14 +67,14 @@ func (e *ensurer) EnsureMachineControllerManagerDeployment(_ context.Context, _ ps.Containers = extensionswebhook.EnsureContainerWithName( newObj.Spec.Template.Spec.Containers, - machinecontrollermanager.ProviderSidecarContainer(newObj.Namespace, onmetal.ProviderName, image.String()), + machinecontrollermanager.ProviderSidecarContainer(newObj.Namespace, ironcore.ProviderName, image.String()), ) - if c := extensionswebhook.ContainerWithName(ps.Containers, "machine-controller-manager-provider-onmetal"); c != nil { + if c := extensionswebhook.ContainerWithName(ps.Containers, "machine-controller-manager-provider-ironcore"); c != nil { ensureMCMCommandLineArgs(c) c.VolumeMounts = extensionswebhook.EnsureVolumeMountWithName(c.VolumeMounts, corev1.VolumeMount{ Name: "cloudprovider", - MountPath: "/etc/onmetal", + MountPath: "/etc/ironcore", ReadOnly: true, }) } @@ -114,7 +114,7 @@ func (e *ensurer) EnsureMachineControllerManagerVPA(_ context.Context, _ gcontex newObj.Spec.ResourcePolicy.ContainerPolicies = extensionswebhook.EnsureVPAContainerResourcePolicyWithName( newObj.Spec.ResourcePolicy.ContainerPolicies, - machinecontrollermanager.ProviderSidecarVPAContainerPolicy(onmetal.ProviderName, minAllowed, maxAllowed), + machinecontrollermanager.ProviderSidecarVPAContainerPolicy(ironcore.ProviderName, minAllowed, maxAllowed), ) return nil } @@ -154,7 +154,7 @@ func (e *ensurer) EnsureClusterAutoscalerDeployment(_ context.Context, _ gcontex } func ensureMCMCommandLineArgs(c *corev1.Container) { - c.Command = extensionswebhook.EnsureStringWithPrefix(c.Command, "--onmetal-kubeconfig=", "/etc/onmetal/kubeconfig") + c.Command = extensionswebhook.EnsureStringWithPrefix(c.Command, "--ironcore-kubeconfig=", "/etc/ironcore/kubeconfig") } func ensureKubeAPIServerCommandLineArgs(c *corev1.Container) { diff --git a/pkg/webhook/controlplane/ensurer_test.go b/pkg/webhook/controlplane/ensurer_test.go index 729c8c7a..daa81889 100644 --- a/pkg/webhook/controlplane/ensurer_test.go +++ b/pkg/webhook/controlplane/ensurer_test.go @@ -1,4 +1,4 @@ -// Copyright 2023 OnMetal authors +// Copyright 2023 IronCore authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -259,7 +259,7 @@ var _ = Describe("Ensurer", func() { BeforeEach(func() { ensurer = NewEnsurer(logger, true) DeferCleanup(testutils.WithVar(&ImageVector, imagevectorutils.ImageVector{{ - Name: "machine-controller-manager-provider-onmetal", + Name: "machine-controller-manager-provider-ironcore", Repository: "foo", Tag: pointer.String("bar"), }})) @@ -269,7 +269,7 @@ var _ = Describe("Ensurer", func() { Expect(deployment.Spec.Template.Spec.Containers).To(BeEmpty()) Expect(ensurer.EnsureMachineControllerManagerDeployment(ctx, nil, deployment, nil)).To(Succeed()) Expect(deployment.Spec.Template.Spec.Containers).To(ConsistOf(corev1.Container{ - Name: "machine-controller-manager-provider-onmetal", + Name: "machine-controller-manager-provider-ironcore", Image: "foo:bar", ImagePullPolicy: corev1.PullIfNotPresent, Command: []string{ @@ -285,7 +285,7 @@ var _ = Describe("Ensurer", func() { "--port=10259", "--target-kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig", "--v=3", - "--onmetal-kubeconfig=/etc/onmetal/kubeconfig", + "--ironcore-kubeconfig=/etc/ironcore/kubeconfig", }, LivenessProbe: &corev1.Probe{ ProbeHandler: corev1.ProbeHandler{ @@ -309,7 +309,7 @@ var _ = Describe("Ensurer", func() { }, { Name: "cloudprovider", - MountPath: "/etc/onmetal", + MountPath: "/etc/ironcore", ReadOnly: true, }, }, @@ -359,7 +359,7 @@ var _ = Describe("Ensurer", func() { ccv := vpaautoscalingv1.ContainerControlledValuesRequestsOnly Expect(vpa.Spec.ResourcePolicy.ContainerPolicies).To(ConsistOf(vpaautoscalingv1.ContainerResourcePolicy{ - ContainerName: "machine-controller-manager-provider-onmetal", + ContainerName: "machine-controller-manager-provider-ironcore", ControlledValues: &ccv, MinAllowed: corev1.ResourceList{ corev1.ResourceCPU: resource.MustParse("30m"),