Move FleetAutoscaling to autoscaling.agones.dev group

This is a pure refactor, to move FleetAutoscaling to the group outlined in #703, where it will stay. Did this one first, since it seemed like the easiest one to tackle.
googleforgames · Jun 13, 2019 · 030e77a · 030e77a
1 parent 6d31aa5
commit 030e77a
Show file tree

Hide file tree

Showing 57 changed files with 1,580 additions and 935 deletions.
diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# ForceUpdate 7 -- change here if you need to force a rebuild
+# ForceUpdate 8 -- change here if you need to force a rebuild
 
 FROM debian:stretch
 

diff --git a/build/build-image/gen-crd-client.sh b/build/build-image/gen-crd-client.sh
@@ -23,6 +23,6 @@ rsync -r /go/src/agones.dev/agones/vendor/k8s.io/ /go/src/k8s.io/
 cd /go/src/k8s.io/code-generator
 ./generate-groups.sh "all" \
     agones.dev/agones/pkg/client \
-    agones.dev/agones/pkg/apis "allocation:v1alpha1 stable:v1alpha1 multicluster:v1alpha1" \
+    agones.dev/agones/pkg/apis "allocation:v1alpha1 stable:v1alpha1 multicluster:v1alpha1 autoscaling:v1alpha1" \
     --go-header-file=/go/src/agones.dev/agones/build/boilerplate.go.txt
 
diff --git a/examples/autoscaler-webhook/main.go b/examples/autoscaler-webhook/main.go
@@ -25,7 +25,7 @@ import (
 	"os"
 	"strconv"
 
-	"agones.dev/agones/pkg/apis/stable/v1alpha1"
+	"agones.dev/agones/pkg/apis/autoscaling/v1alpha1"
 	"agones.dev/agones/pkg/util/runtime" // for the logger
 )
 

diff --git a/examples/fleetautoscaler.yaml b/examples/fleetautoscaler.yaml
@@ -17,7 +17,7 @@
 # automatically depending on load
 #
 
-apiVersion: "stable.agones.dev/v1alpha1"
+apiVersion: "autoscaling.agones.dev/v1alpha1"
 kind: FleetAutoscaler
 metadata:
   # FleetAutoscaler Metadata

diff --git a/examples/simple-udp/fleetautoscaler.yaml b/examples/simple-udp/fleetautoscaler.yaml
@@ -17,7 +17,7 @@
 # up and down depending on usage
 #
 
-apiVersion: "stable.agones.dev/v1alpha1"
+apiVersion: "autoscaling.agones.dev/v1alpha1"
 kind: FleetAutoscaler
 metadata:
   name: simple-udp-autoscaler

diff --git a/examples/webhookfleetautoscaler.yaml b/examples/webhookfleetautoscaler.yaml
@@ -16,7 +16,7 @@
 # Full example of a FleetAutoscaler - this is used to scale a Fleet
 # automatically depending on load
 #
-apiVersion: "stable.agones.dev/v1alpha1"
+apiVersion: "autoscaling.agones.dev/v1alpha1"
 kind: FleetAutoscaler
 metadata:
   name: webhook-fleet-autoscaler

diff --git a/examples/webhookfleetautoscalertls.yaml b/examples/webhookfleetautoscalertls.yaml
@@ -16,7 +16,7 @@
 # Full example of a FleetAutoscaler - this is used to scale a Fleet
 # automatically depending on load
 #
-apiVersion: "stable.agones.dev/v1alpha1"
+apiVersion: "autoscaling.agones.dev/v1alpha1"
 kind: FleetAutoscaler
 metadata:
   name: webhook-fleetautoscaler-tls

diff --git a/examples/xonotic/fleetautoscaler.yaml b/examples/xonotic/fleetautoscaler.yaml
@@ -17,7 +17,7 @@
 # up and down depending on usage
 #
 
-apiVersion: "stable.agones.dev/v1alpha1"
+apiVersion: "autoscaling.agones.dev/v1alpha1"
 kind: FleetAutoscaler
 metadata:
   name: xonotic-autoscaler

diff --git a/install/helm/agones/templates/crds/fleetautoscaler.yaml b/install/helm/agones/templates/crds/fleetautoscaler.yaml
@@ -17,15 +17,15 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: fleetautoscalers.stable.agones.dev
+  name: fleetautoscalers.autoscaling.agones.dev
   labels:
     component: crd
     app: {{ template "agones.name" . }}
     chart: {{ template "agones.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  group: stable.agones.dev
+  group: autoscaling.agones.dev
   version: v1alpha1
   scope: Namespaced
   names:

diff --git a/install/helm/agones/templates/extensions.yaml b/install/helm/agones/templates/extensions.yaml
@@ -75,7 +75,6 @@ webhooks:
           - "gameservers"
           - "gameserversets"
           - "fleetallocations"
-          - "fleetautoscalers"
         apiVersions:
           - "v1alpha1"
         operations:
@@ -86,11 +85,20 @@ webhooks:
           - "fleets"
           - "gameserversets"
           - "fleetallocations"
+        apiVersions:
+          - "v1alpha1"
+        operations:
+          - UPDATE
+      - apiGroups:
+          - autoscaling.agones.dev
+        resources:
           - "fleetautoscalers"
         apiVersions:
           - "v1alpha1"
         operations:
+          - CREATE
           - UPDATE
+
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1
 kind: MutatingWebhookConfiguration

diff --git a/install/helm/agones/templates/hooks/sa.yaml b/install/helm/agones/templates/hooks/sa.yaml
@@ -44,7 +44,7 @@ metadata:
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": before-hook-creation
 rules:
-- apiGroups: ["stable.agones.dev", "multicluster.agones.dev"]
+- apiGroups: ["stable.agones.dev", "multicluster.agones.dev", "autoscaling.agones.dev"]
   resources: ["fleets", "fleetallocations", "fleetautoscalers", "gameservers", "gameserversets", "gameserverallocationpolicies"]
   verbs: ["delete", "list" ]
 - apiGroups: [""]

diff --git a/install/helm/agones/templates/serviceaccounts/controller.yaml b/install/helm/agones/templates/serviceaccounts/controller.yaml
@@ -56,14 +56,20 @@ rules:
   resources: ["gameservers"]
   verbs: ["patch"]
 - apiGroups: ["stable.agones.dev"]
-  resources: ["fleets", "fleetallocations", "fleetautoscalers"]
+  resources: ["fleets", "fleetallocations"]
   verbs: ["get", "list", "update", "watch"]
 - apiGroups: ["stable.agones.dev"]
-  resources: ["fleets/status",  "fleetautoscalers/status", "gameserversets/status"]
+  resources: ["fleets/status", "gameserversets/status"]
   verbs: ["update"]
 - apiGroups: ["multicluster.agones.dev"]
   resources: ["gameserverallocationpolicies"]
   verbs: ["create", "delete", "get", "list", "update", "watch"]
+- apiGroups: ["autoscaling.agones.dev"]
+  resources: ["fleetautoscalers"]
+  verbs: ["get", "list", "update", "watch"]
+- apiGroups: ["autoscaling.agones.dev"]
+  resources: ["fleetautoscalers/status"]
+  verbs: ["update"]
 
 
 ---

diff --git a/install/yaml/install.yaml b/install/yaml/install.yaml
@@ -54,14 +54,20 @@ rules:
   resources: ["gameservers"]
   verbs: ["patch"]
 - apiGroups: ["stable.agones.dev"]
-  resources: ["fleets", "fleetallocations", "fleetautoscalers"]
+  resources: ["fleets", "fleetallocations"]
   verbs: ["get", "list", "update", "watch"]
 - apiGroups: ["stable.agones.dev"]
-  resources: ["fleets/status",  "fleetautoscalers/status", "gameserversets/status"]
+  resources: ["fleets/status", "gameserversets/status"]
   verbs: ["update"]
 - apiGroups: ["multicluster.agones.dev"]
   resources: ["gameserverallocationpolicies"]
   verbs: ["create", "delete", "get", "list", "update", "watch"]
+- apiGroups: ["autoscaling.agones.dev"]
+  resources: ["fleetautoscalers"]
+  verbs: ["get", "list", "update", "watch"]
+- apiGroups: ["autoscaling.agones.dev"]
+  resources: ["fleetautoscalers/status"]
+  verbs: ["update"]
 
 
 ---
@@ -458,15 +464,15 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: fleetautoscalers.stable.agones.dev
+  name: fleetautoscalers.autoscaling.agones.dev
   labels:
     component: crd
     app: agones
     chart: agones-0.11.0
     release: agones-manual
     heritage: Tiller
 spec:
-  group: stable.agones.dev
+  group: autoscaling.agones.dev
   version: v1alpha1
   scope: Namespaced
   names:

diff --git a/pkg/apis/allocation/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/allocation/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/autoscaling/register.go b/pkg/apis/autoscaling/register.go
@@ -0,0 +1,20 @@
+// Copyright 2019 Google LLC All Rights Reserved.
+//
+// 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 autoscaling
+
+const (
+	// GroupName is the Scheme Group Name for Agones Custom Resource Definitions
+	GroupName = "autoscaling.agones.dev"
+)
diff --git a/pkg/apis/autoscaling/v1alpha1/doc.go b/pkg/apis/autoscaling/v1alpha1/doc.go
@@ -0,0 +1,19 @@
+// Copyright 2019 Google LLC All Rights Reserved.
+//
+// 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.
+
+// +k8s:deepcopy-gen=package,register
+
+// Package v1alpha1 is the v1alpha1 version of the API.
+// +groupName=autoscaling.agones.dev
+package v1alpha1
diff --git a/pkg/apis/stable/v1alpha1/fleetautoscaler.go → ...s/autoscaling/v1alpha1/fleetautoscaler.go b/pkg/apis/stable/v1alpha1/fleetautoscaler.go → ...s/autoscaling/v1alpha1/fleetautoscaler.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ import (
 	"crypto/x509"
 	"net/url"
 
+	"agones.dev/agones/pkg/apis/stable/v1alpha1"
 	admregv1b "k8s.io/api/admissionregistration/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -143,7 +144,7 @@ type FleetAutoscaleRequest struct {
 	// Namespace is the namespace associated with the request (if any).
 	Namespace string `json:"namespace"`
 	// The Fleet's status values
-	Status FleetStatus `json:"status"`
+	Status v1alpha1.FleetStatus `json:"status"`
 }
 
 // FleetAutoscaleResponse defines the response of webhook autoscaler endpoint

diff --git a/...s/stable/v1alpha1/fleetautoscaler_test.go → ...oscaling/v1alpha1/fleetautoscaler_test.go b/...s/stable/v1alpha1/fleetautoscaler_test.go → ...oscaling/v1alpha1/fleetautoscaler_test.go
diff --git a/pkg/apis/autoscaling/v1alpha1/register.go b/pkg/apis/autoscaling/v1alpha1/register.go
@@ -0,0 +1,59 @@
+// Copyright 2019 Google LLC All Rights Reserved.
+//
+// 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 v1alpha1
+
+import (
+	"agones.dev/agones/pkg/apis/autoscaling"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	k8sruntime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/kubernetes/scheme"
+)
+
+// SchemeGroupVersion is group version used to register these objects
+var SchemeGroupVersion = schema.GroupVersion{Group: autoscaling.GroupName, Version: "v1alpha1"}
+
+// Kind takes an unqualified kind and returns back a Group qualified GroupKind
+func Kind(kind string) schema.GroupKind {
+	return SchemeGroupVersion.WithKind(kind).GroupKind()
+}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
+var (
+	// SchemeBuilder registers our types
+	SchemeBuilder = k8sruntime.NewSchemeBuilder(addKnownTypes)
+	// AddToScheme local alias for SchemeBuilder.AddToScheme
+	AddToScheme = SchemeBuilder.AddToScheme
+)
+
+func init() {
+	if err := AddToScheme(scheme.Scheme); err != nil {
+		panic(err)
+	}
+}
+
+// Adds the list of known types to api.Scheme.
+func addKnownTypes(scheme *k8sruntime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&FleetAutoscaler{},
+		&FleetAutoscalerList{},
+	)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}