-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e98f4a6
commit 3258a26
Showing
22 changed files
with
1,155 additions
and
94 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,14 @@ | ||
| images: | ||
| # registry cache StatefulSet | ||
| - name: registry | ||
| sourceRepository: github.com/distribution/distribution | ||
| repository: eu.gcr.io/gardener-project/3rd/registry | ||
| tag: "2.8.3" | ||
| # registry-configuration-cleaner DaemonSet | ||
| - name: alpine | ||
| repository: eu.gcr.io/gardener-project/3rd/alpine | ||
| tag: "3.15.8" | ||
| - name: pause | ||
| sourceRepository: github.com/kubernetes/kubernetes/blob/master/build/pause/Dockerfile | ||
| repository: registry.k8s.io/pause | ||
| tag: "3.9" |
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
File renamed without changes.
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
205 changes: 205 additions & 0 deletions
205
pkg/component/registryconfigurationcleaner/registry_configuration_cleaner.go
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,205 @@ | ||
| // Copyright (c) 2023 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 registryconfigurationcleaner | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/gardener/gardener/pkg/client/kubernetes" | ||
| "github.com/gardener/gardener/pkg/component" | ||
| "github.com/gardener/gardener/pkg/utils/managedresources" | ||
| appsv1 "k8s.io/api/apps/v1" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/utils/pointer" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| "github.com/gardener/gardener-extension-registry-cache/pkg/constants" | ||
| ) | ||
|
|
||
| const ( | ||
| managedResourceName = "extension-registry-configuration-cleaner" | ||
| ) | ||
|
|
||
| // Values is a set of configuration values for the registry configuration cleaner. | ||
| type Values struct { | ||
| // AlpineImage is the alpine container image. | ||
| AlpineImage string | ||
| // AlpineImage is the pause container image. | ||
| PauseImage string | ||
| // DeleteSystemdUnit represents whether the cleaner should delete the configure-containerd-registries.service systemd unit. | ||
| DeleteSystemdUnit bool | ||
| // Upstreams are the upstreams which registry configuration will be removed by the cleaner. | ||
| Upstreams []string | ||
| } | ||
|
|
||
| // New creates a new instance of DeployWaiter for registry configuration cleaner. | ||
| func New( | ||
| client client.Client, | ||
| namespace string, | ||
| values Values, | ||
| ) component.DeployWaiter { | ||
| return ®istryConfigurationCleaner{ | ||
| client: client, | ||
| namespace: namespace, | ||
| values: values, | ||
| } | ||
| } | ||
|
|
||
| type registryConfigurationCleaner struct { | ||
| client client.Client | ||
| namespace string | ||
| values Values | ||
| } | ||
|
|
||
| // Deploy implements component.DeployWaiter. | ||
| func (r *registryConfigurationCleaner) Deploy(ctx context.Context) error { | ||
| data, err := r.computeResourcesData() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return managedresources.CreateForShoot(ctx, r.client, r.namespace, managedResourceName, constants.Origin, false, data) | ||
| } | ||
|
|
||
| // Destroy implements component.DeployWaiter. | ||
| func (r *registryConfigurationCleaner) Destroy(ctx context.Context) error { | ||
| return managedresources.Delete(ctx, r.client, r.namespace, managedResourceName, false) | ||
| } | ||
|
|
||
| // TimeoutWaitForManagedResource is the timeout used while waiting for the ManagedResources to become healthy. | ||
| var TimeoutWaitForManagedResource = 3 * time.Minute | ||
|
|
||
| // Wait implements component.DeployWaiter. | ||
| func (r *registryConfigurationCleaner) Wait(ctx context.Context) error { | ||
| timeoutCtx, cancel := context.WithTimeout(ctx, TimeoutWaitForManagedResource) | ||
| defer cancel() | ||
|
|
||
| return managedresources.WaitUntilHealthy(timeoutCtx, r.client, r.namespace, managedResourceName) | ||
| } | ||
|
|
||
| // TimeoutWaitCleanupForManagedResource is the timeout used while waiting for the ManagedResource to be deleted. | ||
| var TimeoutWaitCleanupForManagedResource = 2 * time.Minute | ||
|
|
||
| // WaitCleanup implements component.DeployWaiter. | ||
| func (r *registryConfigurationCleaner) WaitCleanup(ctx context.Context) error { | ||
| timeoutCtx, cancel := context.WithTimeout(ctx, TimeoutWaitCleanupForManagedResource) | ||
| defer cancel() | ||
|
|
||
| return managedresources.WaitUntilDeleted(timeoutCtx, r.client, r.namespace, managedResourceName) | ||
| } | ||
|
|
||
| func (r *registryConfigurationCleaner) computeResourcesData() (map[string][]byte, error) { | ||
| if len(r.values.Upstreams) == 0 { | ||
| return nil, fmt.Errorf("upstreams are required") | ||
| } | ||
|
|
||
| mountPropagationHostToContainer := corev1.MountPropagationHostToContainer | ||
|
|
||
| daemonSet := &appsv1.DaemonSet{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "registry-configuration-cleaner", | ||
| Namespace: metav1.NamespaceSystem, | ||
| }, | ||
| Spec: appsv1.DaemonSetSpec{ | ||
| Selector: &metav1.LabelSelector{ | ||
| MatchLabels: getLabels(), | ||
| }, | ||
| Template: corev1.PodTemplateSpec{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Labels: getLabels(), | ||
| }, | ||
| Spec: corev1.PodSpec{ | ||
| InitContainers: []corev1.Container{ | ||
| { | ||
| Name: "registry-configuration-cleaner", | ||
| Image: r.values.AlpineImage, | ||
| ImagePullPolicy: corev1.PullIfNotPresent, | ||
| SecurityContext: &corev1.SecurityContext{ | ||
| Privileged: pointer.Bool(true), | ||
| }, | ||
| Command: computeCommand(r.values.DeleteSystemdUnit, r.values.Upstreams), | ||
| VolumeMounts: []corev1.VolumeMount{ | ||
| { | ||
| Name: "host-root-volume", | ||
| MountPath: "/host", | ||
| ReadOnly: false, | ||
| MountPropagation: &mountPropagationHostToContainer, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| Containers: []corev1.Container{ | ||
| { | ||
| Name: "pause", | ||
| Image: r.values.PauseImage, | ||
| ImagePullPolicy: corev1.PullIfNotPresent, | ||
| }, | ||
| }, | ||
| HostPID: true, | ||
| Volumes: []corev1.Volume{ | ||
| { | ||
| Name: "host-root-volume", | ||
| VolumeSource: corev1.VolumeSource{ | ||
| HostPath: &corev1.HostPathVolumeSource{ | ||
| Path: "/", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| registry := managedresources.NewRegistry(kubernetes.ShootScheme, kubernetes.ShootCodec, kubernetes.ShootSerializer) | ||
|
|
||
| return registry.AddAllAndSerialize(daemonSet) | ||
| } | ||
|
|
||
| func computeCommand(deleteSystemdUnit bool, upstreams []string) []string { | ||
| command := []string{"sh", "-c"} | ||
|
|
||
| var script strings.Builder | ||
|
|
||
| if deleteSystemdUnit { | ||
| script.WriteString(`if [[ -f /host/etc/systemd/system/configure-containerd-registries.service ]]; then | ||
| chroot /host /bin/bash -c 'systemctl disable configure-containerd-registries.service; systemctl stop configure-containerd-registries.service; rm -f /etc/systemd/system/configure-containerd-registries.service' | ||
| fi | ||
| `) | ||
| script.WriteString("\n") | ||
| } | ||
|
|
||
| for _, upstream := range upstreams { | ||
| script.WriteString(fmt.Sprintf(`if [[ -d /host/etc/containerd/certs.d/%[1]s ]]; then | ||
| rm -rf /host/etc/containerd/certs.d/%[1]s | ||
| fi | ||
| `, upstream)) | ||
| } | ||
|
|
||
| command = append(command, script.String()) | ||
|
|
||
| return command | ||
| } | ||
|
|
||
| func getLabels() map[string]string { | ||
| return map[string]string{ | ||
| "app.kubernetes.io/name": "registry-configuration-cleaner", | ||
| "app.kubernetes.io/instance": "registry-configuration-cleaner", | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
pkg/component/registryconfigurationcleaner/registry_configuration_cleaner_suite_test.go
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,27 @@ | ||
| // Copyright (c) 2023 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 registryconfigurationcleaner_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| func TestRegistryConfigurationCleaner(t *testing.T) { | ||
| RegisterFailHandler(Fail) | ||
| RunSpecs(t, "Component RegistryConfigurationCleaner Suite") | ||
| } |
Oops, something went wrong.