implement v1beta3 tortoise (#219)

Author: sanposhiho

PROJECT

@@ -1,7 +1,3 @@
-# Code generated by tool. DO NOT EDIT.
-# This file is used to track the info used to scaffold your project
-# and allow the plugins properly work.
-# More info: https://book.kubebuilder.io/reference/project-config.html
 domain: mercari.com
 layout:
 - go.kubebuilder.io/v3
@@ -41,4 +37,12 @@ resources:
   kind: Tortoise
   path: github.com/mercari/tortoise/api/v1beta2
   version: v1beta2
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercari.com
+  group: autoscaling
+  kind: Tortoise
+  path: github.com/mercari/tortoise/api/v1beta3
+  version: v1beta3
 version: "3"

api/autoscaling/v2/horizontalpodautoscaler_webhook.go

@@ -37,7 +37,7 @@ import (
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"github.com/mercari/tortoise/api/v1beta2"
+	"github.com/mercari/tortoise/api/v1beta3"
 	"github.com/mercari/tortoise/pkg/annotation"
 	"github.com/mercari/tortoise/pkg/hpa"
 	"github.com/mercari/tortoise/pkg/tortoise"
@@ -83,7 +83,7 @@ func (h *HPAWebhook) Default(ctx context.Context, obj runtime.Object) error {
 		return nil
 	}
 
-	if t.Spec.UpdateMode == v1beta2.UpdateModeOff {
+	if t.Spec.UpdateMode == v1beta3.UpdateModeOff {
 		// DryRun, don't update HPA
 		return nil
 	}
@@ -151,7 +151,7 @@ func (h *HPAWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (wa
 
 	message := fmt.Sprintf("HPA(%s/%s) is being deleted while Tortoise(%s) is running. Please delete Tortoise first", hpa.Namespace, hpa.Name, tortoiseName)
 
-	if t.Spec.UpdateMode == v1beta2.UpdateModeOff {
+	if t.Spec.UpdateMode == v1beta3.UpdateModeOff {
 		// DryRun - don't block the deletion of HPA, but emit warning.
 		return []string{message}, nil
 	}

api/autoscaling/v2/horizontalpodautoscaler_webhook_test.go

@@ -38,7 +38,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	"github.com/mercari/tortoise/api/v1beta2"
+	"github.com/mercari/tortoise/api/v1beta3"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -49,7 +49,7 @@ func mutateTest(before, after, tortoise string) {
 
 	y, err := os.ReadFile(tortoise)
 	Expect(err).NotTo(HaveOccurred())
-	tor := &v1beta2.Tortoise{}
+	tor := &v1beta3.Tortoise{}
 	err = yaml.NewYAMLOrJSONDecoder(bytes.NewReader(y), 4096).Decode(tor)
 	status := tor.Status
 	Expect(err).NotTo(HaveOccurred())
@@ -93,11 +93,11 @@ func mutateTest(before, after, tortoise string) {
 func validateDeletionTest(hpa, tortoise string, valid bool) {
 	ctx := context.Background()
 
-	var tor *v1beta2.Tortoise
+	var tor *v1beta3.Tortoise
 	if tortoise != "" {
 		y, err := os.ReadFile(tortoise)
 		Expect(err).NotTo(HaveOccurred())
-		tor = &v1beta2.Tortoise{}
+		tor = &v1beta3.Tortoise{}
 		err = yaml.NewYAMLOrJSONDecoder(bytes.NewReader(y), 4096).Decode(tor)
 		status := tor.Status
 		Expect(err).NotTo(HaveOccurred())
@@ -174,7 +174,7 @@ var _ = Describe("v2.HPA Webhook", func() {
 			// create tortoise
 			y, err := os.ReadFile(filepath.Join("testdata", "validating", "hpa-with-auto-being-deleted", "tortoise.yaml"))
 			Expect(err).NotTo(HaveOccurred())
-			tor := &v1beta2.Tortoise{}
+			tor := &v1beta3.Tortoise{}
 			err = yaml.NewYAMLOrJSONDecoder(bytes.NewReader(y), 4096).Decode(tor)
 			// add finalizer
 			controllerutil.AddFinalizer(tor, tortoiseFinalizer)

api/autoscaling/v2/testdata/mutating/has-annotation-but-invalid1/tortoise.yaml

@@ -11,16 +11,16 @@ spec:
     scaleTargetRef:
       kind: Deployment
       name: sample
-  resourcePolicy:
+status:
+  autoscalingPolicy:
     - containerName: istio-proxy
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
     - containerName: nginx
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
-status:
   tortoisePhase: Working
   containerResourcePhases:
     - containerName: "nginx"

api/autoscaling/v2/testdata/mutating/has-annotation-but-invalid2/tortoise.yaml

@@ -11,16 +11,16 @@ spec:
     scaleTargetRef:
       kind: Deployment
       name: sample
-  resourcePolicy:
+status:
+  autoscalingPolicy:
     - containerName: istio-proxy
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
     - containerName: nginx
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
-status:
   tortoisePhase: Working
   containerResourcePhases:
     - containerName: "nginx"

api/autoscaling/v2/testdata/mutating/mutate-by-recommendations/tortoise.yaml

@@ -11,16 +11,16 @@ spec:
     scaleTargetRef:
       kind: Deployment
       name: sample
-  resourcePolicy:
+status:
+  autoscalingPolicy:
     - containerName: istio-proxy
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
     - containerName: nginx
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
-status:
   tortoisePhase: Working
   containerResourcePhases:
     - containerName: "nginx"

api/autoscaling/v2/testdata/mutating/no-mutate-by-recommendations-when-dryrun/tortoise.yaml

@@ -11,16 +11,16 @@ spec:
     scaleTargetRef:
       kind: Deployment
       name: sample
-  resourcePolicy:
+status:
+  autoscalingPolicy:
     - containerName: istio-proxy
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
     - containerName: nginx
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
-status:
   tortoisePhase: Working
   containerResourcePhases:
     - containerName: "nginx"

api/autoscaling/v2/testdata/validating/hpa-with-auto-being-deleted/tortoise.yaml

@@ -12,16 +12,16 @@ spec:
     scaleTargetRef:
       kind: Deployment
       name: sample
-  resourcePolicy:
+status:
+  autoscalingPolicy:
     - containerName: istio-proxy
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
     - containerName: nginx
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
-status:
   tortoisePhase: Working
   containerResourcePhases:
     - containerName: "nginx"

api/autoscaling/v2/testdata/validating/hpa-with-auto-existing/tortoise.yaml

@@ -11,16 +11,16 @@ spec:
     scaleTargetRef:
       kind: Deployment
       name: sample
-  resourcePolicy:
+status:
+  autoscalingPolicy:
     - containerName: istio-proxy
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
     - containerName: nginx
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
-status:
   tortoisePhase: Working
   containerResourcePhases:
     - containerName: "nginx"

api/autoscaling/v2/testdata/validating/hpa-with-off/tortoise.yaml

@@ -11,16 +11,16 @@ spec:
     scaleTargetRef:
       kind: Deployment
       name: sample
-  resourcePolicy:
+status:
+  autoscalingPolicy:
     - containerName: istio-proxy
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
     - containerName: nginx
-      autoscalingPolicy:
+      policy:
         cpu: Horizontal
         memory: Vertical
-status:
   tortoisePhase: Working
   containerResourcePhases:
     - containerName: "nginx"