Skip to content

WIP support for major minor versioning for aks clusters #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: spectro-v1beta1
Choose a base branch
from
+43 −2
Open

WIP support for major minor versioning for aks clusters #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions exp/api/v1beta1/azuremanagedcontrolplane_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

var kubeSemver = regexp.MustCompile(`^v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)([-0-9a-zA-Z_\.+]*)?$`)
const pattern = `^v\d+\.\d+(\.\d+)?$`

var kubeSemver = regexp.MustCompile(pattern)

// SetupWebhookWithManager sets up and registers the webhook with the manager.
func (m *AzureManagedControlPlane) SetupWebhookWithManager(mgr ctrl.Manager) error {
Expand Down Expand Up @@ -409,7 +411,6 @@ func (m *AzureManagedControlPlane) validateVersion(_ client.Client) error {
if !kubeSemver.MatchString(m.Spec.Version) {
return errors.New("must be a valid semantic version")
}

return nil
}

Expand Down
40 changes: 40 additions & 0 deletions exp/api/v1beta1/azuremanagedcontrolplane_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,36 @@ func TestValidatingWebhook(t *testing.T) {
},
expectErr: true,
},
{
name: "InValid Version ..",
amcp: AzureManagedControlPlane{
Spec: AzureManagedControlPlaneSpec{
DNSServiceIP: pointer.StringPtr("192.168.0.0"),
Version: "..",
},
},
expectErr: true,
},
{
name: "InValid Version v1.20.",
amcp: AzureManagedControlPlane{
Spec: AzureManagedControlPlaneSpec{
DNSServiceIP: pointer.StringPtr("192.168.0.0"),
Version: "v1.20.",
},
},
expectErr: true,
},
{
name: "InValid Version v1.20.a",
amcp: AzureManagedControlPlane{
Spec: AzureManagedControlPlaneSpec{
DNSServiceIP: pointer.StringPtr("192.168.0.0"),
Version: "v1.20.a",
},
},
expectErr: true,
},
{
name: "Valid Version",
amcp: AzureManagedControlPlane{
Expand All @@ -212,6 +242,16 @@ func TestValidatingWebhook(t *testing.T) {
},
expectErr: false,
},
{
name: "Valid Version",
amcp: AzureManagedControlPlane{
Spec: AzureManagedControlPlaneSpec{
DNSServiceIP: pointer.StringPtr("192.168.0.0"),
Version: "v1.17",
},
},
expectErr: false,
},
{
name: "Valid Managed AADProfile",
amcp: AzureManagedControlPlane{
Expand Down