Skip to content

Commit

Permalink
vendor g/g 1.59 (#338)
Browse files Browse the repository at this point in the history
  • Loading branch information
majst01 authored Aug 1, 2023
1 parent 6dabd7f commit 5ceabe3
Show file tree
Hide file tree
Showing 11 changed files with 219 additions and 136 deletions.
27 changes: 0 additions & 27 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,6 @@ export GO111MODULE := on
TOOLS_DIR := hack/tools
-include vendor/github.com/gardener/gardener/hack/tools.mk

#########################################
# Rules for local development scenarios #
#########################################

.PHONY: start-provider-metal
start-provider-metal:
@LEADER_ELECTION_NAMESPACE=garden go run \
-ldflags $(LD_FLAGS) \
-tags netgo \
./cmd/gardener-extension-provider-metal \
--config-file=./example/00-componentconfig.yaml \
--ignore-operation-annotation=$(IGNORE_OPERATION_ANNOTATION) \
--leader-election=$(LEADER_ELECTION) \
--webhook-config-server-host=$(HOSTNAME) \
--webhook-config-server-port=8443 \
--webhook-config-mode=url \
--webhook-config-url=$(WEBHOOK_CONFIG_URL)

.PHONY: start-admission-metal
start-admission-metal:
@LEADER_ELECTION_NAMESPACE=garden go run \
-ldflags $(LD_FLAGS) \
-tags netgo \
./cmd/gardener-extension-admission-metal \
--webhook-config-server-host=0.0.0.0 \
--webhook-config-server-port=9443 \
--webhook-config-cert-dir=./example/admission-metal-certs

#################################################################
# Rules related to binary build, Docker image build and release #
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ spec:
- provider-metal-controller-manager
- --config-file=/etc/{{ include "name" . }}/config/config.yaml
- --controlplane-max-concurrent-reconciles={{ .Values.controllers.controlplane.concurrentSyncs }}
- --heartbeat-namespace={{ .Release.Namespace }}
- --heartbeat-renew-interval-seconds={{ .Values.controllers.heartbeat.renewIntervalSeconds }}
- --infrastructure-max-concurrent-reconciles={{ .Values.controllers.infrastructure.concurrentSyncs }}
- --ignore-operation-annotation={{ .Values.controllers.ignoreOperationAnnotation }}
- --worker-max-concurrent-reconciles={{ .Values.controllers.worker.concurrentSyncs }}
Expand Down
4 changes: 3 additions & 1 deletion charts/gardener-extension-provider-metal/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@ rules:
- leases
verbs:
- create
- list
- watch
- apiGroups:
- coordination.k8s.io
resources:
- leases
resourceNames:
- provider-metal-leader-election
- gardener-extension-heartbeat
verbs:
- get
- watch
- update
- apiGroups:
- ""
Expand Down
2 changes: 2 additions & 0 deletions charts/gardener-extension-provider-metal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ controllers:
concurrentSyncs: 5
infrastructure:
concurrentSyncs: 5
heartbeat:
renewIntervalSeconds: 30
worker:
concurrentSyncs: 5
ignoreOperationAnnotation: false
Expand Down
16 changes: 16 additions & 0 deletions cmd/gardener-extension-provider-metal/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ import (
shootcontrolplanewebhook "github.com/metal-stack/gardener-extension-provider-metal/pkg/webhook/controlplane"
metalcontrolplaneexposure "github.com/metal-stack/gardener-extension-provider-metal/pkg/webhook/controlplaneexposure"

"github.com/gardener/gardener/extensions/pkg/controller/heartbeat"
heartbeatcmd "github.com/gardener/gardener/extensions/pkg/controller/heartbeat/cmd"

"github.com/gardener/gardener/extensions/pkg/controller"
controllercmd "github.com/gardener/gardener/extensions/pkg/controller/cmd"
"github.com/gardener/gardener/extensions/pkg/controller/controlplane/genericactuator"
Expand Down Expand Up @@ -71,6 +74,13 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
MaxConcurrentReconciles: 5,
}

// options for the heartbeat controller
heartbeatCtrlOpts = &heartbeatcmd.Options{
ExtensionName: metal.Name,
RenewIntervalSeconds: 30,
Namespace: os.Getenv("LEADER_ELECTION_NAMESPACE"),
}

// options for the worker controller
workerCtrlOpts = &controllercmd.ControllerOptions{
MaxConcurrentReconciles: 5,
Expand Down Expand Up @@ -101,6 +111,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
controllercmd.PrefixOption("infrastructure-", infraCtrlOpts),
controllercmd.PrefixOption("healthcheck-", healthCheckCtrlOpts),
controllercmd.PrefixOption("worker-", &workerCtrlOptsUnprefixed),
controllercmd.PrefixOption("heartbeat-", heartbeatCtrlOpts),
configFileOpts,
reconcileOpts,
controllerSwitches,
Expand All @@ -118,6 +129,10 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
return fmt.Errorf("error completing options: %w", err)
}

if err := heartbeatCtrlOpts.Validate(); err != nil {
return err
}

util.ApplyClientConnectionConfigurationToRESTConfig(configFileOpts.Completed().Config.ClientConnection, restOpts.Completed().Config)

if workerReconcileOpts.Completed().DeployCRDs {
Expand Down Expand Up @@ -182,6 +197,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
configFileOpts.Completed().ApplyHealthCheckConfig(&healthcheck.DefaultAddOptions.HealthCheckDefaults.HealthCheckConfig)
controlPlaneCtrlOpts.Completed().Apply(&metalcontrolplane.DefaultAddOptions.Controller)
infraCtrlOpts.Completed().Apply(&metalinfrastructure.DefaultAddOptions.Controller)
heartbeatCtrlOpts.Completed().Apply(&heartbeat.DefaultAddOptions)
healthCheckCtrlOpts.Completed().Apply(&healthcheck.DefaultAddOptions.HealthCheckDefaults.Controller)
reconcileOpts.Completed().Apply(&metalinfrastructure.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&metalcontrolplane.DefaultAddOptions.IgnoreOperationAnnotation)
Expand Down
4 changes: 2 additions & 2 deletions example/controller-registration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ metadata:
name: provider-metal
type: helm
providerConfig:
chart: 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
chart: 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
values:
image:
tag: v0.20.14
tag: v0.20.8
---
apiVersion: core.gardener.cloud/v1beta1
kind: ControllerRegistration
Expand Down
22 changes: 2 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ require (
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bronze1man/yaml2json v0.0.0-20211227013850-8972abeaea25 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-oidc/v3 v3.6.0 // indirect
Expand Down Expand Up @@ -149,7 +150,7 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
istio.io/api v0.0.0-20220512181135-e8ec1e1d89de // indirect
istio.io/client-go v1.14.0 // indirect
k8s.io/apiserver v0.25.0 // indirect
k8s.io/apiserver v0.26.3 // indirect
k8s.io/autoscaler/vertical-pod-autoscaler v0.12.0 // indirect
k8s.io/gengo v0.0.0-20220913193501-391367153a38 // indirect
k8s.io/helm v2.16.1+incompatible // indirect
Expand All @@ -168,28 +169,9 @@ require (

replace (
github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.8.0 // keep this value in sync with k8s.io/apiserver
github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.9.4
github.com/gardener/gardener => github.com/gardener/gardener v1.56.0
github.com/gardener/hvpa-controller => github.com/gardener/hvpa-controller v0.5.0
github.com/gardener/hvpa-controller/api => github.com/gardener/hvpa-controller/api v0.5.0
github.com/google/gnostic => github.com/google/gnostic v0.5.7-v3refs // keep this value in sync with k8s.io/apiserver
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.12.2 // keep this value in sync with sigs.k8s.io/controller-runtime
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8
google.golang.org/grpc => google.golang.org/grpc v1.47.0 // keep this value in sync with k8s.io/apiserver
k8s.io/api => k8s.io/api v0.25.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.0
k8s.io/apimachinery => k8s.io/apimachinery v0.25.0
k8s.io/apiserver => k8s.io/apiserver v0.25.0
k8s.io/autoscaler => k8s.io/autoscaler v0.0.0-20220531185024-cc90d57b7fe1 // translates to k8s.io/autoscaler/[email protected]
k8s.io/client-go => k8s.io/client-go v0.25.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.0
k8s.io/code-generator => k8s.io/code-generator v0.25.0
k8s.io/component-base => k8s.io/component-base v0.25.0

// for some reason, newer gengo versions will fail with "hit an unsupported type"
k8s.io/gengo => k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
k8s.io/helm => k8s.io/helm v2.16.1+incompatible
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.13.0
)
Loading

0 comments on commit 5ceabe3

Please sign in to comment.