Adding v1 version for gmsacredentialspec CRDs

Signed-off-by: Mark Rossetti <[email protected]>
kubernetes-sigs · Aug 12, 2021 · 91609f2 · 91609f2
1 parent 85e30b7
commit 91609f2
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 4 deletions.
diff --git a/admission-webhook/deploy/gmsa-crd.yml b/admission-webhook/deploy/gmsa-crd.yml
@@ -8,6 +8,49 @@ spec:
   group: windows.k8s.io
   versions:
   - name: v1alpha1
+    served: true
+    storage: false
+    deprecated: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          credspec:
+            description: GMSA Credential Spec
+            type: object
+            properties:
+              ActiveDirectoryConfig:
+                type: object
+                properties:
+                  GroupManagedServiceAccounts:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        Name:
+                          type: string
+                        Scope:
+                          type: string
+              CmsPlugins:
+                type: array
+                items:
+                  type: string
+              DomainJoinConfig:
+                type: object
+                properties:
+                  DnsName:
+                    type: string
+                  DnsTreeName:
+                    type: string
+                  Guid:
+                    type: string
+                  MachineAccountName:
+                    type: string
+                  NetBiosName:
+                    type: string
+                  Sid:
+                    type: string
+  - name: v1
     served: true
     storage: true
     schema:
@@ -49,6 +92,8 @@ spec:
                     type: string
                   Sid:
                     type: string
+  conversion:
+    strategy: None
   names:
     kind: GMSACredentialSpec
     plural: gmsacredentialspecs

diff --git a/admission-webhook/integration_tests/templates/credspec-0.yml b/admission-webhook/integration_tests/templates/credspec-0.yml
@@ -1,6 +1,6 @@
 # a sample cred spec
 
-apiVersion: windows.k8s.io/v1alpha1
+apiVersion: windows.k8s.io/v1
 kind: GMSACredentialSpec
 metadata:
   name: {{ index .CredSpecNames 0 }}

diff --git a/admission-webhook/integration_tests/templates/credspec-2.yml b/admission-webhook/integration_tests/templates/credspec-2.yml
@@ -1,6 +1,6 @@
 # a sample cred spec
 
-apiVersion: windows.k8s.io/v1alpha1
+apiVersion: windows.k8s.io/v1
 kind: GMSACredentialSpec
 metadata:
   name: {{ index .CredSpecNames 2 }}

diff --git a/admission-webhook/kube_client.go b/admission-webhook/kube_client.go
@@ -18,7 +18,7 @@ import (
 const (
 	// these 3 constants are the coordinates of the Custom Resource Definition
 	crdAPIGroup     = "windows.k8s.io"
-	crdAPIVersion   = "v1alpha1"
+	crdAPIVersion   = "v1"
 	crdResourceName = "gmsacredentialspecs"
 
 	// crdContentsField is the single field that's expected to be defined in a GMSA CRD,

diff --git a/scripts/GenerateCredentialSpecResource.ps1 b/scripts/GenerateCredentialSpecResource.ps1
@@ -54,7 +54,7 @@ Remove-Item $dockerCredSpecPath
 
 # generate the k8s resource
 $resource = [ordered]@{
-    "apiVersion" = "windows.k8s.io/v1alpha1";
+    "apiVersion" = "windows.k8s.io/v1";
     "kind" = 'GMSACredentialSpec';
     "metadata" = @{
         "name" = $ResourceName