change apiGroup to keda.sh

Signed-off-by: Zbynek Roubalik <zroubali@redhat.com>
PaulLiang1 · Aug 6, 2020 · 1246a22 · 1246a22
1 parent c29e303
commit 1246a22
Show file tree

Hide file tree

Showing 13 changed files with 152 additions and 4,573 deletions.
diff --git a/README.md b/README.md
@@ -125,8 +125,8 @@ To be KEDA to be fully operational we need to deploy Metrics Server first.
 
 1. Deploy CRDs and KEDA into `keda` namespace
    ```bash
-   kubectl apply -f deploy/crds/keda.k8s.io_scaledobjects_crd.yaml
-   kubectl apply -f deploy/crds/keda.k8s.io_triggerauthentications_crd.yaml
+   kubectl apply -f deploy/crds/keda.sh_scaledobjects_crd.yaml
+   kubectl apply -f deploy/crds/keda.sh_triggerauthentications_crd.yaml
    kubectl apply -f deploy/
    ```
 2. Scale down `keda-operator` Deployment

diff --git a/deploy/10-cluster_role.yaml b/deploy/10-cluster_role.yaml
@@ -28,6 +28,7 @@ rules:
   - deployments
   - deployments/finalizers
   - replicasets
+  - statefulsets
   verbs:
   - '*'
 - apiGroups:
@@ -44,7 +45,7 @@ rules:
   - get
   - create
 - apiGroups:
-  - keda.k8s.io
+  - keda.sh
   resources:
   - '*'
   verbs:
@@ -55,3 +56,9 @@ rules:
   - horizontalpodautoscalers
   verbs:
    - '*'
+- apiGroups:
+  - "*"
+  resources:
+  - "*/scale"
+  verbs:
+  - "*"
diff --git a/deploy/crds/keda.k8s.io_scaledobjects_crd.yaml b/deploy/crds/keda.k8s.io_scaledobjects_crd.yaml
diff --git a/deploy/crds/keda.sh_scaledobjects_crd.yaml b/deploy/crds/keda.sh_scaledobjects_crd.yaml
@@ -0,0 +1,123 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: scaledobjects.keda.sh
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.scaleTargetKind
+    name: ScaleTargetKind
+    type: string
+  - JSONPath: .spec.scaleTargetRef.name
+    name: ScaleTargetName
+    type: string
+  - JSONPath: .spec.triggers[*].type
+    name: Triggers
+    type: string
+  - JSONPath: .metadata.creationTimestamp
+    name: Age
+    type: date
+  group: keda.sh
+  names:
+    kind: ScaledObject
+    listKind: ScaledObjectList
+    plural: scaledobjects
+    singular: scaledobject
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: ScaledObject is a specification for a ScaledObject resource
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: ScaledObjectSpec is the spec for a ScaledObject resource
+          properties:
+            cooldownPeriod:
+              format: int32
+              type: integer
+            maxReplicaCount:
+              format: int32
+              type: integer
+            minReplicaCount:
+              format: int32
+              type: integer
+            pollingInterval:
+              format: int32
+              type: integer
+            scaleTargetRef:
+              description: ScaleTarget holds the a reference to the scale target Object
+              properties:
+                apiVersion:
+                  type: string
+                containerName:
+                  type: string
+                kind:
+                  type: string
+                name:
+                  type: string
+              required:
+              - name
+              type: object
+            triggers:
+              items:
+                description: ScaleTriggers reference the scaler that will be used
+                properties:
+                  authenticationRef:
+                    description: ScaledObjectAuthRef points to the TriggerAuthentication
+                      object that is used to authenticate the scaler with the environment
+                    properties:
+                      name:
+                        type: string
+                    required:
+                    - name
+                    type: object
+                  metadata:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  name:
+                    type: string
+                  type:
+                    type: string
+                required:
+                - metadata
+                - type
+                type: object
+              type: array
+          required:
+          - scaleTargetRef
+          - triggers
+          type: object
+        status:
+          description: ScaledObjectStatus is the status for a ScaledObject resource
+          properties:
+            externalMetricNames:
+              items:
+                type: string
+              type: array
+            lastActiveTime:
+              format: date-time
+              type: string
+            scaleTargetKind:
+              type: string
+          type: object
+      required:
+      - spec
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
diff --git a/...da.k8s.io_triggerauthentications_crd.yaml → ...s/keda.sh_triggerauthentications_crd.yaml b/...da.k8s.io_triggerauthentications_crd.yaml → ...s/keda.sh_triggerauthentications_crd.yaml
@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: triggerauthentications.keda.k8s.io
+  name: triggerauthentications.keda.sh
 spec:
-  group: keda.k8s.io
+  group: keda.sh
   names:
     kind: TriggerAuthentication
     listKind: TriggerAuthenticationList
@@ -17,12 +17,12 @@ spec:
         apiVersion:
           description: 'APIVersion defines the versioned schema of this representation
             of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
         kind:
           description: 'Kind is a string value representing the REST resource this
             object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object

diff --git a/...keda.k8s.io_v1alpha1_scaledobject_cr.yaml → ...rds/keda.sh_v1alpha1_scaledobject_cr.yaml b/...keda.k8s.io_v1alpha1_scaledobject_cr.yaml → ...rds/keda.sh_v1alpha1_scaledobject_cr.yaml
diff --git a/...io_v1alpha1_triggerauthentication_cr.yaml → ...sh_v1alpha1_triggerauthentication_cr.yaml b/...io_v1alpha1_triggerauthentication_cr.yaml → ...sh_v1alpha1_triggerauthentication_cr.yaml
diff --git a/pkg/apis/keda/v1alpha1/doc.go b/pkg/apis/keda/v1alpha1/doc.go
@@ -1,4 +1,4 @@
 // Package v1alpha1 contains API Schema definitions for the keda v1alpha1 API group
 // +k8s:deepcopy-gen=package,register
-// +groupName=keda.k8s.io
+// +groupName=keda.sh
 package v1alpha1
diff --git a/pkg/apis/keda/v1alpha1/register.go b/pkg/apis/keda/v1alpha1/register.go
@@ -2,7 +2,7 @@
 
 // Package v1alpha1 contains API Schema definitions for the keda v1alpha1 API group
 // +k8s:deepcopy-gen=package,register
-// +groupName=keda.k8s.io
+// +groupName=keda.sh
 package v1alpha1
 
 import (
@@ -12,7 +12,7 @@ import (
 
 var (
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "keda.k8s.io", Version: "v1alpha1"}
+	SchemeGroupVersion = schema.GroupVersion{Group: "keda.sh", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}

diff --git a/tests/scalers/azure-blob.test.ts b/tests/scalers/azure-blob.test.ts
@@ -64,7 +64,7 @@ test.after.always('clean up azure-blob deployment', t => {
     const resources = [
         'secret/test-secrets',
         'deployment.apps/test-deployment',
-        'scaledobject.keda.k8s.io/test-scaledobject'
+        'scaledobject.keda.sh/test-scaledobject'
     ]
 
     for (const resource of resources) {
@@ -124,15 +124,13 @@ spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: test-scaledobject
-  labels:
-    deploymentName: test-deployment
 spec:
   scaleTargetRef:
-    deploymentName: test-deployment
+    name: test-deployment
   pollingInterval: 20
   maxReplicaCount: 2
   cooldownPeriod: 10

diff --git a/tests/scalers/azure-queue-trigger-auth.test.ts b/tests/scalers/azure-queue-trigger-auth.test.ts
@@ -80,7 +80,7 @@ test.after.always.cb('clean up azure-queue deployment', t => {
   const resources = [
     'secret/test-secrets',
     'deployment.apps/test-deployment',
-    'scaledobject.keda.k8s.io/test-scaledobject',
+    'scaledobject.keda.sh/test-scaledobject',
   ]
 
   for (const resource of resources) {
@@ -131,15 +131,13 @@ spec:
         - name: FUNCTIONS_WORKER_RUNTIME
           value: node
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: test-scaledobject
-  labels:
-    deploymentName: test-deployment
 spec:
   scaleTargetRef:
-    deploymentName: test-deployment
+    name: test-deployment
   pollingInterval: 5
   maxReplicaCount: 1
   cooldownPeriod: 10
@@ -150,7 +148,7 @@ spec:
     metadata:
       queueName: ${queueName}
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: TriggerAuthentication
 metadata:
   name: azure-queue-auth

diff --git a/tests/scalers/azure-queue.test.ts b/tests/scalers/azure-queue.test.ts
@@ -78,7 +78,7 @@ test.after.always.cb('clean up azure-queue deployment', t => {
   const resources = [
     'secret/test-secrets',
     'deployment.apps/test-deployment',
-    'scaledobject.keda.k8s.io/test-scaledobject',
+    'scaledobject.keda.sh/test-scaledobject',
   ]
 
   for (const resource of resources) {
@@ -134,15 +134,13 @@ spec:
               name: test-secrets
               key: AzureWebJobsStorage
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: test-scaledobject
-  labels:
-    deploymentName: test-deployment
 spec:
   scaleTargetRef:
-    deploymentName: test-deployment
+    name: test-deployment
   pollingInterval: 5
   maxReplicaCount: 4
   cooldownPeriod: 10

diff --git a/tests/setup.test.ts b/tests/setup.test.ts
@@ -43,11 +43,11 @@ test.serial('Deploy Keda', t => {
     }
   }
 
-  if (sh.exec('kubectl apply -f ../deploy/crds/keda.k8s.io_scaledobjects_crd.yaml').code !== 0) {
+  if (sh.exec('kubectl apply -f ../deploy/crds/keda.sh_scaledobjects_crd.yaml').code !== 0) {
     t.fail('error deploying keda. ' + result)
   }
   if (
-    sh.exec('kubectl apply -f ../deploy/crds/keda.k8s.io_triggerauthentications_crd.yaml').code !==
+    sh.exec('kubectl apply -f ../deploy/crds/keda.sh_triggerauthentications_crd.yaml').code !==
     0
   ) {
     t.fail('error deploying keda. ' + result)