Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to new MachineControllerManagerDeployment feature gate #221

Merged
merged 5 commits into from
Jun 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ $(CLEAN): $(LOCALBIN)
.PHONY: clean
clean: $(CLEAN)
@$(shell find ./example -type f -name "controller-registration.yaml" -exec rm '{}' \;)
$(CLEAN) ./cmd/... ./pkg/... ./test/...
$(CLEAN) ./cmd/... ./pkg/...

$(GOLANGCI_LINT): $(call tool_version_file,$(GOLANGCI_LINT),$(GOLANGCI_LINT_VERSION))
@# CGO_ENABLED has to be set to 1 in order for golangci-lint to be able to load plugins
Expand Down Expand Up @@ -156,7 +156,7 @@ docs: gen-crd-api-reference-docs ## Run go generate to generate API reference do

.PHONY: format
format: $(FORMAT)
$(FORMAT) ./cmd ./pkg ./test
$(FORMAT) ./cmd ./pkg

.PHONY: fmt
fmt: goimports ## Run goimports against code.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ spec:
{{- end }}
- --health-bind-address=:{{ .Values.healthPort }}
- --gardener-version={{ .Values.gardener.version }}
{{- if .Values.gardener.gardenlet.featureGates.MachineControllerManagerDeployment }}
- --gardenlet-manages-mcm={{ .Values.gardener.gardenlet.featureGates.MachineControllerManagerDeployment }}
{{- end }}
env:
- name: LEADER_ELECTION_NAMESPACE
valueFrom:
Expand Down
2 changes: 2 additions & 0 deletions charts/gardener-extension-provider-onmetal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,7 @@ config:
# DisableGardenerServiceAccountCreation: false
gardener:
version: ""
gardenlet:
featureGates: {}
seed:
provider: onmetal
8 changes: 4 additions & 4 deletions cmd/gardener-extension-admission-onmetal/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ import (
"context"
"fmt"

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"

controllercmd "github.com/gardener/gardener/extensions/pkg/controller/cmd"
"github.com/gardener/gardener/extensions/pkg/util"
webhookcmd "github.com/gardener/gardener/extensions/pkg/webhook/cmd"
Expand All @@ -33,6 +29,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
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"
)

var log = logf.Log.WithName("gardener-extension-admission-onmetal")
Expand Down
4 changes: 2 additions & 2 deletions cmd/gardener-extension-admission-onmetal/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ package main
import (
"os"

"github.com/onmetal/gardener-extension-provider-onmetal/cmd/gardener-extension-admission-onmetal/app"

"github.com/gardener/gardener/pkg/logger"
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"
)

func main() {
Expand Down
9 changes: 8 additions & 1 deletion cmd/gardener-extension-provider-onmetal/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ 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"
onmetalbastion "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/bastion"
"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"
Expand All @@ -42,11 +41,13 @@ import (
onmetalinstall "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/install"
onmetalcmd "github.com/onmetal/gardener-extension-provider-onmetal/pkg/cmd"
bastioncontroller "github.com/onmetal/gardener-extension-provider-onmetal/pkg/controller/bastion"
onmetalbastion "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"
)

// NewControllerManagerCommand creates a new command for running a onmetal provider controller.
Expand Down Expand Up @@ -193,6 +194,12 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
bastionCtrlOpts.Completed().Apply(&bastioncontroller.DefaultAddOptions.Controller)
reconcileOpts.Completed().Apply(&bastioncontroller.DefaultAddOptions.IgnoreOperationAnnotation)

// TODO(rfranzke): Remove the GardenletManagesMCM fields as soon as the general options no longer support the
// GardenletManagesMCM field.
workercontroller.DefaultAddOptions.GardenletManagesMCM = generalOpts.Completed().GardenletManagesMCM
controlplanewebhook.GardenletManagesMCM = generalOpts.Completed().GardenletManagesMCM
healthcheck.GardenletManagesMCM = generalOpts.Completed().GardenletManagesMCM

if _, err := webhookOptions.Completed().AddToManager(ctx, mgr); err != nil {
return fmt.Errorf("could not add webhooks to manager: %w", err)
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/gardener-extension-provider-onmetal/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ import (
"os"

"github.com/gardener/gardener/pkg/logger"
"github.com/onmetal/gardener-extension-provider-onmetal/cmd/gardener-extension-provider-onmetal/app"
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-provider-onmetal/app"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion example/controller-registration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: provider-onmetal
type: helm
providerConfig:
chart: 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
chart: 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
values:
image:
tag: v0.1.6
Expand Down
4 changes: 2 additions & 2 deletions pkg/admission/cmd/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package cmd

import (
"github.com/onmetal/gardener-extension-provider-onmetal/pkg/admission/validator"

webhookcmd "github.com/gardener/gardener/extensions/pkg/webhook/cmd"

"github.com/onmetal/gardener-extension-provider-onmetal/pkg/admission/validator"
)

// GardenWebhookSwitchOptions are the webhookcmd.SwitchOptions for the admission webhooks.
Expand Down
4 changes: 2 additions & 2 deletions pkg/admission/decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
package admission

import (
"github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal"

"github.com/gardener/gardener/extensions/pkg/util"
"k8s.io/apimachinery/pkg/runtime"

"github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal"
)

// DecodeControlPlaneConfig decodes the `ControlPlaneConfig` from the given `RawExtension`.
Expand Down
4 changes: 2 additions & 2 deletions pkg/admission/validator/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (
"context"
"fmt"

onmetalvalidation "github.com/onmetal/gardener-extension-provider-onmetal/pkg/apis/onmetal/validation"

extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook"
corev1 "k8s.io/api/core/v1"
"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"
)

type secret struct{}
Expand Down
Loading