Upgrade turndownschedules CRD to apiextensions v1

apiextensions.k8s.io/v1beta1 is removed as of K8s v1.22 [1], so all CRDs have to be updated to apiextensions.k8s.io/v1. This commit does the upgrade for the turndownschedule CRD. As part of the API updates, K8s is enforcing things grouped under *.k8s.io to be approved [2] because they are actually supposed to be Kuberenetes community-managed APIs [3]. So this commit also changes the CRD from: turndownschedules.kubecost.k8s.io to turndownschedules.kubecost.com This is in-line with K8s rules and links to our main domain. Tested by applying cluster-turndown-full.yaml and example-schedule.yaml successfully. [1] https://cloud.google.com/kubernetes-engine/docs/deprecations/apis-1-22 [2] kubernetes/enhancements#1111 [3] kubernetes/enhancements#1111 (comment)
kubecost · May 27, 2022 · 4b898df · 4b898df
1 parent d83d9eb
commit 4b898df
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 82 deletions.
diff --git a/README.md b/README.md
@@ -152,12 +152,12 @@ $ kubectl get pods -l app=cluster-turndown -n turndown
 Cluster Turndown uses a Kubernetes Custom Resource Definition to create schedules. There is an example resource located at `artifacts/example-schedule.yaml`:
 
 ```yaml
-apiVersion: kubecost.k8s.io/v1alpha1
+apiVersion: kubecost.com/v1alpha1
 kind: TurndownSchedule
 metadata:
   name: example-schedule
   finalizers:
-  - "finalizer.kubecost.k8s.io"
+  - "finalizer.kubecost.com"
 spec:
   start: 2020-03-12T00:00:00Z
   end: 2020-03-12T12:00:00Z
@@ -201,19 +201,19 @@ Details regarding the status of the turndown schedule can be found by outputting
 ```bash
 $ kubectl get tds example-schedule -o yaml
 
-apiVersion: kubecost.k8s.io/v1alpha1
+apiVersion: kubecost.com/v1alpha1
 kind: TurndownSchedule
 metadata:
   annotations:
     kubectl.kubernetes.io/last-applied-configuration: |
-      {"apiVersion":"kubecost.k8s.io/v1alpha1","kind":"TurndownSchedule","metadata":{"annotations":{},"finalizers":["finalizer.kubecost.k8s.io"],"name":"example-schedule"},"spec":{"end":"2020-03-17T00:35:00Z","repeat":"daily","start":"2020-03-17T00:20:00Z"}}
+      {"apiVersion":"kubecost.com/v1alpha1","kind":"TurndownSchedule","metadata":{"annotations":{},"finalizers":["finalizer.kubecost.com"],"name":"example-schedule"},"spec":{"end":"2020-03-17T00:35:00Z","repeat":"daily","start":"2020-03-17T00:20:00Z"}}
   creationTimestamp: "2020-03-17T00:18:39Z"
   finalizers:
-  - finalizer.kubecost.k8s.io
+  - finalizer.kubecost.com
   generation: 1
   name: example-schedule
   resourceVersion: "33573"
-  selfLink: /apis/kubecost.k8s.io/v1alpha1/turndownschedules/example-schedule
+  selfLink: /apis/kubecost.com/v1alpha1/turndownschedules/example-schedule
   uid: d9b16aed-67e4-11ea-b591-42010a8e0075
 spec:
   end: "2020-03-17T00:35:00Z"

diff --git a/artifacts/cluster-turndown-full.yaml b/artifacts/cluster-turndown-full.yaml
@@ -14,7 +14,7 @@ metadata:
     app: cluster-turndown
 rules:
   - apiGroups:
-      - kubecost.k8s.io
+      - kubecost.com
     resources:
       - turndownschedules
       - turndownschedules/status
@@ -204,13 +204,12 @@ spec:
           secretName: cluster-turndown-service-key
 ---
 # TurndownSchedule Custom Resource Definition for persistence
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: turndownschedules.kubecost.k8s.io
+  name: turndownschedules.kubecost.com
 spec:
-  group: kubecost.k8s.io
-  version: v1alpha1
+  group: kubecost.com
   names:
     kind: TurndownSchedule
     singular: turndownschedule
@@ -219,33 +218,38 @@ spec:
     - td
     - tds
   scope: Cluster
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      properties:
-        spec:
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
           type: object
           properties:
-            start: 
-              type: string
-              format: date-time
-            end:
-              type: string
-              format: date-time
-            repeat: 
-              type: string
-              enum: [none, daily, weekly]
-  additionalPrinterColumns:
-  - name: State
-    type: string
-    description: The state of the turndownschedule 
-    JSONPath: .status.state
-  - name: Next Turndown
-    type: string
-    description: The next turndown date-time
-    JSONPath: .status.nextScaleDownTime
-  - name: Next Turn Up
-    type: string
-    description: The next turn up date-time
-    JSONPath: .status.nextScaleUpTime
+            spec:
+              type: object
+              properties:
+                start:
+                  type: string
+                  format: date-time
+                end:
+                  type: string
+                  format: date-time
+                repeat:
+                  type: string
+                  enum: [none, daily, weekly]
+      additionalPrinterColumns:
+      - name: State
+        type: string
+        description: The state of the turndownschedule
+        jsonPath: .status.state
+      - name: Next Turndown
+        type: string
+        description: The next turndown date-time
+        jsonPath: .status.nextScaleDownTime
+      - name: Next Turn Up
+        type: string
+        description: The next turn up date-time
+        jsonPath: .status.nextScaleUpTime
diff --git a/artifacts/example-schedule.yaml b/artifacts/example-schedule.yaml
@@ -1,10 +1,10 @@
-apiVersion: kubecost.k8s.io/v1alpha1
+apiVersion: kubecost.com/v1alpha1
 kind: TurndownSchedule
 metadata:
   name: example-schedule
   finalizers:
-  - "finalizer.kubecost.k8s.io"
+  - "finalizer.kubecost.com"
 spec:
   start: 2020-03-12T00:00:00Z
   end: 2020-03-12T12:00:00Z
-  repeat: daily
+  repeat: daily
diff --git a/artifacts/turndown-schedule-definition.yaml b/artifacts/turndown-schedule-definition.yaml
@@ -1,10 +1,9 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: turndownschedules.kubecost.k8s.io
+  name: turndownschedules.kubecost.com
 spec:
-  group: kubecost.k8s.io
-  version: v1alpha1
+  group: kubecost.com
   names:
     kind: TurndownSchedule
     singular: turndownschedule
@@ -13,34 +12,38 @@ spec:
     - td
     - tds
   scope: Cluster
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      type: object
-      properties:
-        spec:
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
           type: object
           properties:
-            start: 
-              type: string
-              format: date-time
-            end:
-              type: string
-              format: date-time
-            repeat: 
-              type: string
-              enum: [none, daily, weekly]
-  additionalPrinterColumns:
-  - name: State
-    type: string
-    description: The state of the turndownschedule 
-    JSONPath: .status.state
-  - name: Next Turndown
-    type: string
-    description: The next turndown date-time
-    JSONPath: .status.nextScaleDownTime
-  - name: Next Turn Up
-    type: string
-    description: The next turn up date-time
-    JSONPath: .status.nextScaleUpTime
+            spec:
+              type: object
+              properties:
+                start:
+                  type: string
+                  format: date-time
+                end:
+                  type: string
+                  format: date-time
+                repeat:
+                  type: string
+                  enum: [none, daily, weekly]
+      additionalPrinterColumns:
+      - name: State
+        type: string
+        description: The state of the turndownschedule
+        jsonPath: .status.state
+      - name: Next Turndown
+        type: string
+        description: The next turndown date-time
+        jsonPath: .status.nextScaleDownTime
+      - name: Next Turn Up
+        type: string
+        description: The next turn up date-time
+        jsonPath: .status.nextScaleUpTime
diff --git a/pkg/apis/turndownschedule/register.go b/pkg/apis/turndownschedule/register.go
@@ -1,5 +1,5 @@
 package turndownschedule
 
 const (
-	GroupName = "kubecost.k8s.io"
+	GroupName = "kubecost.com"
 )
diff --git a/pkg/apis/turndownschedule/v1alpha1/doc.go b/pkg/apis/turndownschedule/v1alpha1/doc.go
@@ -1,7 +1,7 @@
 // +k8s:deepcopy-gen=package,register
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:openapi-gen=true
-// +groupName=kubecost.k8s.io
+// +groupName=kubecost.com
 
 // Package v1alpha1 is the v1alpha1 version of the API.
 package v1alpha1
diff --git a/...nerated/clientset/versioned/typed/turndownschedule/v1alpha1/fake/fake_turndownschedule.go b/...nerated/clientset/versioned/typed/turndownschedule/v1alpha1/fake/fake_turndownschedule.go
diff --git a/pkg/generated/clientset/versioned/typed/turndownschedule/v1alpha1/turndownschedule_client.go b/pkg/generated/clientset/versioned/typed/turndownschedule/v1alpha1/turndownschedule_client.go
diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go
diff --git a/pkg/turndown/schedulecontroller.go b/pkg/turndown/schedulecontroller.go
@@ -41,7 +41,7 @@ const (
 	// due to an existing turndown schedule.
 	ErrAlreadyScheduled = "ErrAlreadyScheduled"
 
-	TurndownScheduleFinalizer = "finalizer.kubecost.k8s.io"
+	TurndownScheduleFinalizer = "finalizer.kubecost.com"
 
 	ScheduleStateSuccess   = "ScheduleSuccess"
 	ScheduleStateFailed    = "ScheduleFailed"