Skip to content

Commit

Permalink
Make the cache size field immutable
Browse files Browse the repository at this point in the history
Currently we are using StatefulSet volumeClaimTemplate to provision the PVC. However the corresponding StatefulSet field that controls the PVC size is immutable. It is not possible to resize/enlarge the underlying PVC through the StatefulSet spec. See kubernetes/enhancements#661
This commit makes the cache size field immutable until we decide how to implement the resize.
  • Loading branch information
ialidzhikov committed Oct 9, 2023
1 parent 31cdc3c commit ba0785e
Show file tree
Hide file tree
Showing 8 changed files with 392 additions and 78 deletions.
35 changes: 35 additions & 0 deletions pkg/admission/validator/helper.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// 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 validator

import (
"github.com/gardener/gardener/pkg/apis/core"

"github.com/gardener/gardener-extension-registry-cache/pkg/constants"
)

// FindRegistryCacheExtension finds the registry-cache extension.
// The first return argument is whether the extension was found.
// The second return argument is index of the extension in the list. -1 is returned if the extension is not found.
// The third return arguement is the extension itself. An empty extension is returned if the extension is not found.
func FindRegistryCacheExtension(extensions []core.Extension) (bool, int, core.Extension) {
for i, ext := range extensions {
if ext.Type == constants.ExtensionType {
return true, i, ext
}
}

return false, -1, core.Extension{}
}
62 changes: 62 additions & 0 deletions pkg/admission/validator/helper_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// 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 validator_test

import (
"github.com/gardener/gardener/pkg/apis/core"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/runtime"

"github.com/gardener/gardener-extension-registry-cache/pkg/admission/validator"
)

var _ = Describe("Helpers", func() {

DescribeTable("#FindRegistryCacheExtension",
func(extensions []core.Extension, expectedOk bool, expectedI int, expectedExt core.Extension) {
ok, i, ext := validator.FindRegistryCacheExtension(extensions)
Expect(ok).To(Equal(expectedOk))
Expect(i).To(Equal(expectedI))
Expect(ext).To(Equal(expectedExt))
},

Entry("extensions is nil",
nil,
false, -1, core.Extension{},
),
Entry("extensions is empty",
[]core.Extension{},
false, -1, core.Extension{},
),
Entry("no registry-cache extension",
[]core.Extension{
{Type: "foo"},
{Type: "bar"},
{Type: "baz"},
},
false, -1, core.Extension{},
),
Entry("with registry-cache extension",
[]core.Extension{
{Type: "foo"},
{Type: "bar"},
{Type: "registry-cache", ProviderConfig: &runtime.RawExtension{Raw: []byte(`{"one": "two"}`)}},
{Type: "baz"},
},
true, 2, core.Extension{Type: "registry-cache", ProviderConfig: &runtime.RawExtension{Raw: []byte(`{"one": "two"}`)}},
),
)
})
44 changes: 30 additions & 14 deletions pkg/admission/validator/shoot.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (

api "github.com/gardener/gardener-extension-registry-cache/pkg/apis/registry"
"github.com/gardener/gardener-extension-registry-cache/pkg/apis/registry/validation"
"github.com/gardener/gardener-extension-registry-cache/pkg/constants"
)

// shoot validates shoots
Expand All @@ -42,22 +41,14 @@ func NewShootValidator(decoder runtime.Decoder) extensionswebhook.Validator {
}

// Validate validates the given shoot object
func (s *shoot) Validate(_ context.Context, new, _ client.Object) error {
func (s *shoot) Validate(_ context.Context, new, old client.Object) error {
shoot, ok := new.(*core.Shoot)
if !ok {
return fmt.Errorf("wrong object type %T", new)
}

var ext *core.Extension
var fldPath *field.Path
for i, ex := range shoot.Spec.Extensions {
if ex.Type == constants.ExtensionType {
ext = ex.DeepCopy()
fldPath = field.NewPath("spec", "extensions").Index(i)
break
}
}
if ext == nil {
ok, i, ext := FindRegistryCacheExtension(shoot.Spec.Extensions)
if !ok {
return nil
}

Expand All @@ -67,7 +58,7 @@ func (s *shoot) Validate(_ context.Context, new, _ client.Object) error {
}
}

providerConfigPath := fldPath.Child("providerConfig")
providerConfigPath := field.NewPath("spec", "extensions").Index(i).Child("providerConfig")
if ext.ProviderConfig == nil {
return field.Required(providerConfigPath, "providerConfig is required for the registry-cache extension")
}
Expand All @@ -77,5 +68,30 @@ func (s *shoot) Validate(_ context.Context, new, _ client.Object) error {
return fmt.Errorf("failed to decode providerConfig: %w", err)
}

return validation.ValidateRegistryConfig(registryConfig, providerConfigPath).ToAggregate()
allErrs := field.ErrorList{}

if old != nil {
oldShoot, ok := old.(*core.Shoot)
if !ok {
return fmt.Errorf("wrong object type %T for old object", old)
}

oldOk, _, oldExt := FindRegistryCacheExtension(oldShoot.Spec.Extensions)
if oldOk {
if oldExt.ProviderConfig == nil {
return fmt.Errorf("providerConfig is not available on old Shoot")
}

oldRegistryConfig := &api.RegistryConfig{}
if err := runtime.DecodeInto(s.decoder, oldExt.ProviderConfig.Raw, oldRegistryConfig); err != nil {
return fmt.Errorf("failed to decode providerConfig: %w", err)
}

allErrs = append(allErrs, validation.ValidateRegistryConfigUpdate(oldRegistryConfig, registryConfig, providerConfigPath)...)
}
}

allErrs = append(allErrs, validation.ValidateRegistryConfig(registryConfig, providerConfigPath)...)

return allErrs.ToAggregate()
}
184 changes: 120 additions & 64 deletions pkg/admission/validator/shoot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,74 +87,130 @@ var _ = Describe("Shoot validator", func() {
}
})

It("should return err when new is not a Shoot", func() {
err := shootValidator.Validate(ctx, &corev1.Pod{}, nil)
Expect(err).To(MatchError("wrong object type *v1.Pod"))
})

It("should do nothing when the Shoot does no specify a registry-cache extension", func() {
shoot.Spec.Extensions[0].Type = "foo"

Expect(shootValidator.Validate(ctx, shoot, nil)).To(Succeed())
})

It("should return err when there is contrainer runtime that is not containerd", func() {
worker := core.Worker{
CRI: &core.CRI{
Name: "docker",
},
}
shoot.Spec.Provider.Workers = append(shoot.Spec.Provider.Workers, worker)

err := shootValidator.Validate(ctx, shoot, nil)
Expect(err).To(MatchError("container runtime needs to be containerd when the registry-cache extension is enabled"))
})

It("should return err when registry-cache's providerConfig is nil", func() {
shoot.Spec.Extensions[0].ProviderConfig = nil

err := shootValidator.Validate(ctx, shoot, nil)
Expect(err).To(PointTo(MatchFields(IgnoreExtras, Fields{
"Type": Equal(field.ErrorTypeRequired),
"Field": Equal("spec.extensions[0].providerConfig"),
"Detail": Equal("providerConfig is required for the registry-cache extension"),
})))
})

It("should return err when registry-cache's providerConfig cannot be decoded", func() {
shoot.Spec.Extensions[0].ProviderConfig = &runtime.RawExtension{
Raw: []byte(`{"bar": "baz"}`),
}

err := shootValidator.Validate(ctx, shoot, nil)
Expect(err).To(MatchError(ContainSubstring("failed to decode providerConfig")))
})

It("should return err when registry-cache's providerConfig is invalid", func() {
shoot.Spec.Extensions[0].ProviderConfig = &runtime.RawExtension{
Raw: encode(&v1alpha1.RegistryConfig{
TypeMeta: metav1.TypeMeta{
APIVersion: v1alpha1.SchemeGroupVersion.String(),
Kind: "RegistryConfig",
Context("Shoot creation (old is nil)", func() {
It("should return err when new is not a Shoot", func() {
err := shootValidator.Validate(ctx, &corev1.Pod{}, nil)
Expect(err).To(MatchError("wrong object type *v1.Pod"))
})

It("should do nothing when the Shoot does no specify a registry-cache extension", func() {
shoot.Spec.Extensions[0].Type = "foo"

Expect(shootValidator.Validate(ctx, shoot, nil)).To(Succeed())
})

It("should return err when there is contrainer runtime that is not containerd", func() {
worker := core.Worker{
CRI: &core.CRI{
Name: "docker",
},
Caches: []v1alpha1.RegistryCache{
{
Upstream: "https://registry.example.com",
}
shoot.Spec.Provider.Workers = append(shoot.Spec.Provider.Workers, worker)

err := shootValidator.Validate(ctx, shoot, nil)
Expect(err).To(MatchError("container runtime needs to be containerd when the registry-cache extension is enabled"))
})

It("should return err when registry-cache providerConfig is nil", func() {
shoot.Spec.Extensions[0].ProviderConfig = nil

err := shootValidator.Validate(ctx, shoot, nil)
Expect(err).To(PointTo(MatchFields(IgnoreExtras, Fields{
"Type": Equal(field.ErrorTypeRequired),
"Field": Equal("spec.extensions[0].providerConfig"),
"Detail": Equal("providerConfig is required for the registry-cache extension"),
})))
})

It("should return err when registry-cache providerConfig cannot be decoded", func() {
shoot.Spec.Extensions[0].ProviderConfig = &runtime.RawExtension{
Raw: []byte(`{"bar": "baz"}`),
}

err := shootValidator.Validate(ctx, shoot, nil)
Expect(err).To(MatchError(ContainSubstring("failed to decode providerConfig")))
})

It("should return err when registry-cache providerConfig is invalid", func() {
shoot.Spec.Extensions[0].ProviderConfig = &runtime.RawExtension{
Raw: encode(&v1alpha1.RegistryConfig{
TypeMeta: metav1.TypeMeta{
APIVersion: v1alpha1.SchemeGroupVersion.String(),
Kind: "RegistryConfig",
},
},
}),
}

err := shootValidator.Validate(ctx, shoot, nil)
Expect(err).To(ConsistOf(PointTo(MatchFields(IgnoreExtras, Fields{
"Type": Equal(field.ErrorTypeInvalid),
"Field": Equal("spec.extensions[0].providerConfig.caches[0].upstream"),
"Detail": ContainSubstring("upstream must not include a scheme"),
}))))
Caches: []v1alpha1.RegistryCache{
{
Upstream: "https://registry.example.com",
},
},
}),
}

err := shootValidator.Validate(ctx, shoot, nil)
Expect(err).To(ConsistOf(PointTo(MatchFields(IgnoreExtras, Fields{
"Type": Equal(field.ErrorTypeInvalid),
"Field": Equal("spec.extensions[0].providerConfig.caches[0].upstream"),
"Detail": ContainSubstring("upstream must not include a scheme"),
}))))
})

It("should succeed for valid Shoot", func() {
Expect(shootValidator.Validate(ctx, shoot, nil)).To(Succeed())
})
})

It("should succeed for valid Shoot", func() {
Expect(shootValidator.Validate(ctx, shoot, nil)).To(Succeed())
Context("Shoot update (old is set)", func() {
var oldShoot *core.Shoot

BeforeEach(func() {
oldShoot = shoot.DeepCopy()
})

It("should return err when old is not a Shoot", func() {
err := shootValidator.Validate(ctx, shoot, &corev1.Pod{})
Expect(err).To(MatchError("wrong object type *v1.Pod for old object"))
})

It("should return err when old Shoot registry-cache providerConfig is nil", func() {
oldShoot.Spec.Extensions[0].ProviderConfig = nil

err := shootValidator.Validate(ctx, shoot, oldShoot)
Expect(err).To(MatchError(ContainSubstring("providerConfig is not available on old Shoot")))
})

It("should return err when old Shoot registry-cache providerConfig cannot be decoded", func() {
oldShoot.Spec.Extensions[0].ProviderConfig = &runtime.RawExtension{
Raw: []byte(`{"bar": "baz"}`),
}

err := shootValidator.Validate(ctx, shoot, oldShoot)
Expect(err).To(MatchError(ContainSubstring("failed to decode providerConfig")))
})

It("should return err when registry-cache providerConfig update is invalid", func() {
newSize := resource.MustParse("42Gi")
shoot.Spec.Extensions[0].ProviderConfig = &runtime.RawExtension{
Raw: encode(&v1alpha1.RegistryConfig{
TypeMeta: metav1.TypeMeta{
APIVersion: v1alpha1.SchemeGroupVersion.String(),
Kind: "RegistryConfig",
},
Caches: []v1alpha1.RegistryCache{
{
Upstream: "docker.io",
Size: &newSize,
},
},
}),
}

err := shootValidator.Validate(ctx, shoot, oldShoot)
Expect(err).To(ConsistOf(PointTo(MatchFields(IgnoreExtras, Fields{
"Type": Equal(field.ErrorTypeInvalid),
"Field": Equal("spec.extensions[0].providerConfig.caches[0].size"),
"Detail": Equal("field is immutable"),
}))))
})
})
})
})
Expand Down
Loading

0 comments on commit ba0785e

Please sign in to comment.