-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #589 from ScheererJ/network-webhook/disable-overla…
…y-network Create shoot cluster per default without overlay network for kubernetes >= 1.22.
- Loading branch information
Showing
25 changed files
with
1,898 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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-aws/pkg/aws" | ||
|
|
||
| "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: aws.Type, | ||
| NetworkProvider: calico.Type, | ||
| Types: []extensionswebhook.Type{ | ||
| {Obj: &extensionsv1alpha1.Network{}}, | ||
| }, | ||
| Mutator: NewMutator(logger), | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| // 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 ( | ||
| "context" | ||
|
|
||
| extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook" | ||
| "github.com/go-logr/logr" | ||
|
|
||
| calicov1alpha1 "github.com/gardener/gardener-extension-networking-calico/pkg/apis/calico/v1alpha1" | ||
| calicov1alpha1helper "github.com/gardener/gardener-extension-networking-calico/pkg/apis/calico/v1alpha1/helper" | ||
| "github.com/gardener/gardener/extensions/pkg/webhook/network" | ||
| extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" | ||
| "github.com/gardener/gardener/pkg/extensions" | ||
| versionutils "github.com/gardener/gardener/pkg/utils/version" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/utils/pointer" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| // NewMutator creates a new network mutator. | ||
| func NewMutator(logger logr.Logger) extensionswebhook.Mutator { | ||
| mutator := &mutator{} | ||
| mutator.mutator = network.NewMutator(logger, mutator.mutateNetworkConfig) | ||
| return mutator | ||
| } | ||
|
|
||
| type mutator struct { | ||
| client client.Client | ||
| mutator extensionswebhook.Mutator | ||
| } | ||
|
|
||
| // InjectClient injects the given client into the mutator. | ||
| func (m *mutator) InjectClient(client client.Client) error { | ||
| m.client = client | ||
| return nil | ||
| } | ||
|
|
||
| // Mutate validates and if needed mutates the given object. | ||
| func (m *mutator) Mutate(ctx context.Context, new, old client.Object) error { | ||
| return m.mutator.Mutate(ctx, new, old) | ||
| } | ||
|
|
||
| func (m *mutator) mutateNetworkConfig(new, old *extensionsv1alpha1.Network) error { | ||
| extensionswebhook.LogMutation(logger, "Network", new.Namespace, new.Name) | ||
|
|
||
| var ( | ||
| networkConfig *calicov1alpha1.NetworkConfig | ||
| ipv4 = calicov1alpha1.IPv4{Mode: (*calicov1alpha1.IPv4PoolMode)(pointer.StringPtr(string(calicov1alpha1.Never)))} | ||
| backendNone = calicov1alpha1.None | ||
| ipv4PoolMode = calicov1alpha1.Never | ||
| err error | ||
| ) | ||
|
|
||
| // do network resource update only for a create operation | ||
| if old != nil { | ||
| return nil | ||
| } | ||
|
|
||
| // source/destination checks are only disabled for kubernetes >= 1.22 | ||
| // see https://github.com/gardener/machine-controller-manager-provider-aws/issues/36 for details | ||
| if greaterEqual122, err := m.isKubernetesGreaterOrEqual122(new.Namespace); err != nil { | ||
| return err | ||
| } else if !greaterEqual122 { | ||
| return nil | ||
| } | ||
|
|
||
| if new.Spec.ProviderConfig != nil { | ||
| networkConfig, err = calicov1alpha1helper.CalicoNetworkConfigFromNetworkResource(new) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } else { | ||
| networkConfig = &calicov1alpha1.NetworkConfig{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: calicov1alpha1.SchemeGroupVersion.String(), | ||
| Kind: "NetworkConfig", | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| if networkConfig.IPv4 == nil { | ||
| networkConfig.IPv4 = &ipv4 | ||
| } | ||
|
|
||
| if networkConfig.IPv4 != nil && networkConfig.IPv4.Mode == nil { | ||
| networkConfig.IPv4.Mode = &ipv4PoolMode | ||
| } | ||
|
|
||
| if networkConfig.Backend == nil { | ||
| networkConfig.Backend = &backendNone | ||
| } | ||
|
|
||
| new.Spec.ProviderConfig = &runtime.RawExtension{ | ||
| Object: networkConfig, | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (m *mutator) isKubernetesGreaterOrEqual122(name string) (bool, error) { | ||
| cluster, err := extensions.GetCluster(context.TODO(), m.client, name) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| return versionutils.CompareVersions(cluster.Shoot.Spec.Kubernetes.Version, ">=", "1.22") | ||
| } |
Oops, something went wrong.