Skip to content

Commit

Permalink
run shoot cluster without overlay if not explicitly specified
Browse files Browse the repository at this point in the history
  • Loading branch information
dkistner authored and ScheererJ committed Aug 4, 2022
1 parent 1472e43 commit 49ac2da
Show file tree
Hide file tree
Showing 28 changed files with 1,865 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ spec:
checksum/configmap-openstack-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 }}
prometheus.io/scrape: "true"
# default metrics endpoint in controller-runtime
prometheus.io/port: "{{ .Values.metricsPort }}"
{{- end }}
labels:
{{ include "labels" . | indent 8 }}
spec:
Expand Down
7 changes: 7 additions & 0 deletions charts/gardener-extension-provider-openstack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ webhookConfig:
leaderElection:
resourceLock: leases

## settings for metrics, e.g. scraping by seed-prometheus
##
metrics:
## enable metrics scraping
##
enableScraping: false

config:
clientConnection:
acceptContentTypes: application/json
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-openstack
type: helm
providerConfig:
chart: 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
chart: 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
values:
image:
tag: v1.29.0-dev
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/coreos/go-systemd/v22 v22.3.2
github.com/gardener/etcd-druid v0.9.0
github.com/gardener/gardener v1.50.1
github.com/gardener/gardener-extension-networking-calico v1.25.0
github.com/gardener/machine-controller-manager v0.45.0
github.com/go-logr/logr v1.2.3
github.com/golang/mock v1.6.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ github.com/gardener/external-dns-management v0.7.18 h1:15uIyFfZSbR8fivnXvqb1Dvv4
github.com/gardener/external-dns-management v0.7.18/go.mod h1:oHhauLQ3/sop0c1urS6n304Wqv/WM4me0geLn9nTAcY=
github.com/gardener/gardener v1.50.1 h1:crSoXqFsquARZnm2NeCt8vT8L2tDMfcmfw7N5AuD92c=
github.com/gardener/gardener v1.50.1/go.mod h1:Rc2JNnGPMEH+0Wm04EOVLmu9VonyU4JCk1VjOjHUGx8=
github.com/gardener/gardener-extension-networking-calico v1.25.0 h1:mkdroxXFkMDNgX0wMrqGWKBGuB4YaXnNFIJFSgeyyCk=
github.com/gardener/gardener-extension-networking-calico v1.25.0/go.mod h1:A6pG11WJwT0WD7fY6nNupfm/w9YNla7P9YTcC/Baz5I=
github.com/gardener/hvpa-controller/api v0.5.0 h1:f4F3O7YUrenwh4S3TgPREPiB287JjjUiUL18OqPLyAA=
github.com/gardener/hvpa-controller/api v0.5.0/go.mod h1:QQl3ELkCaki+8RhXl0FZMfvnm0WCGwGJlGmrxJj6lvM=
github.com/gardener/machine-controller-manager v0.45.0 h1:rpf0PHRXJMGY93oMruNP+tnMawKJXhhzCACyNJsT8Lo=
Expand Down
3 changes: 3 additions & 0 deletions pkg/cmd/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
cloudproviderwebhook "github.com/gardener/gardener-extension-provider-openstack/pkg/webhook/cloudprovider"
controlplanewebhook "github.com/gardener/gardener-extension-provider-openstack/pkg/webhook/controlplane"
controlplaneexposurewebhook "github.com/gardener/gardener-extension-provider-openstack/pkg/webhook/controlplaneexposure"
networkwebhook "github.com/gardener/gardener-extension-provider-openstack/pkg/webhook/network"

extensionsbackupbucketcontroller "github.com/gardener/gardener/extensions/pkg/controller/backupbucket"
extensionsbackupentrycontroller "github.com/gardener/gardener/extensions/pkg/controller/backupentry"
Expand All @@ -41,6 +42,7 @@ 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"
extensionsnetworkwebhook "github.com/gardener/gardener/extensions/pkg/webhook/network"
)

// ControllerSwitchOptions are the controllercmd.SwitchOptions for the provider controllers.
Expand All @@ -61,6 +63,7 @@ func ControllerSwitchOptions() *controllercmd.SwitchOptions {
// WebhookSwitchOptions are the webhookcmd.SwitchOptions for the provider webhooks.
func WebhookSwitchOptions(gardenerVersion *string) *webhookcmd.SwitchOptions {
return webhookcmd.NewSwitchOptions(
webhookcmd.Switch(extensionsnetworkwebhook.WebhookName, networkwebhook.AddToManager),
webhookcmd.Switch(extensioncontrolplanewebhook.WebhookName, controlplanewebhook.AddToManager),
webhookcmd.Switch(extensioncontrolplanewebhook.ExposureWebhookName, controlplaneexposurewebhook.AddToManager),
webhookcmd.Switch(extensionscloudproviderwebhook.WebhookName, cloudproviderwebhook.AddToManager(gardenerVersion)),
Expand Down
41 changes: 41 additions & 0 deletions pkg/webhook/network/add.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright (c) 2022 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package network

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

"github.com/gardener/gardener-extension-networking-calico/pkg/calico"
extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook"
"github.com/gardener/gardener/extensions/pkg/webhook/network"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
)

var logger = log.Log.WithName("networking-calico-webhook")

// AddToManager creates a webhook and adds it to the manager.
func AddToManager(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
logger.Info("Adding webhook to manager")
return network.New(mgr, network.Args{
CloudProvider: openstack.Type,
NetworkProvider: calico.Type,
Types: []extensionswebhook.Type{
{Obj: &extensionsv1alpha1.Network{}},
},
Mutator: network.NewMutator(logger, mutateNetworkConfig),
})
}
Loading

0 comments on commit 49ac2da

Please sign in to comment.