refactor: switch back to podscales (#38)

.github/workflows/official-release.yml

@@ -6,7 +6,7 @@ on:
       - main
       - development
     tags:
-      - "containerscale-controller/v*"
+      - "podscale-controller/v*"
       - "pod-autoscaler/v*"
 
 jobs:

.gitignore

@@ -21,6 +21,6 @@ vendor/
 # binaries
 pkg/*/pod-autoscaler
 pkg/*/pod-replicas-updater
-pkg/*/containerscale-controller
+pkg/*/podscale-controller
 pkg/*/http-metrics
 pkg/*/metrics-exposer

Makefile

@@ -1,5 +1,5 @@
 MAKEFLAGS += --no-print-directory
-COMPONENTS = pod-replicas-updater pod-autoscaler containerscale-controller
+COMPONENTS = pod-replicas-updater pod-autoscaler podscale-controller
 
 ifeq (,$(shell go env GOBIN))
 GOBIN=$(shell go env GOPATH)/bin
@@ -12,7 +12,7 @@ endif
 all: build test coverage manifests release clean
 
 # Build binary
-build: fmt manifests test vet
+build: fmt test vet
 	$(call action, build)
 
 coverage:
@@ -29,7 +29,7 @@ fmt:
 
 install: install-crds install-rbac
 
-install-crds: manifests
+install-crds:
 	@echo "install CRDs manifests"
 	@kubectl apply -f config/crd/bases
 

README.md

@@ -11,7 +11,7 @@ The controllers are freely inspired from [sample-controller](https://github.com/
 - [Contention Manager](pkg/contention-manager/README.md)
 - [Pod Replicas Updater](pkg/pod-replicas-updater/README.md)
 - [Pod Resource Updater](pkg/pod-resource-updater/README.md)
-- [Containerscale Controller](pkg/containerscale-controller/README.md)
+- [PodScale Controller](pkg/podscale-controller/README.md)
 - [Recommender](pkg/recommender/README.md)
 
 # CRDs code generation

artifacts/example-podscale.yaml

@@ -1,7 +1,7 @@
 apiVersion: systemautoscaler.polimi.it/v1beta1
-kind: ContainerScale
+kind: PodScale
 metadata:
-  name: example-containerscale
+  name: example-podscale
 spec:
   serviceLevelAgreement:
     name: example-sla

config/crd/bases/systemautoscaler.polimi.it_containerscales.yaml → config/crd/bases/systemautoscaler.polimi.it_podscales.yaml

@@ -6,21 +6,21 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
-  name: containerscales.systemautoscaler.polimi.it
+  name: podscales.systemautoscaler.polimi.it
 spec:
   group: systemautoscaler.polimi.it
   names:
-    kind: ContainerScale
-    listKind: ContainerScaleList
-    plural: containerscales
-    singular: containerscale
+    kind: PodScale
+    listKind: PodScaleList
+    plural: podscales
+    singular: podscale
   preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1beta1
     schema:
       openAPIV3Schema:
-        description: ContainerScale defines the mapping between a `ServiceLevelAgreement`
+        description: PodScale defines the mapping between a `ServiceLevelAgreement`
           and a `Pod` matching the selector. It also keeps track of the resource values
           computed by `Recommender` and adjusted by `Contention Manager`.
         properties:
@@ -37,7 +37,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: ContainerScaleSpec is the spec for a ContainerScale resource
+            description: PodScaleSpec is the spec for a PodScale resource
             properties:
               container:
                 type: string
@@ -50,49 +50,24 @@ spec:
                   x-kubernetes-int-or-string: true
                 description: ResourceList is a set of (resource name, quantity) pairs.
                 type: object
+              namespace:
+                type: string
               pod:
-                description: PodRef is a reference to a pod
-                properties:
-                  name:
-                    type: string
-                  namespace:
-                    type: string
-                required:
-                - name
-                - namespace
-                type: object
+                type: string
               service:
-                description: ServiceRef is a reference to a service
-                properties:
-                  name:
-                    type: string
-                  namespace:
-                    type: string
-                required:
-                - name
-                - namespace
-                type: object
+                type: string
               serviceLevelAgreement:
-                description: SLARef is a reference to a service level agreement
-                properties:
-                  name:
-                    type: string
-                  namespace:
-                    type: string
-                required:
-                - name
-                - namespace
-                type: object
+                type: string
             required:
             - container
+            - namespace
             - pod
             - service
             - serviceLevelAgreement
             type: object
           status:
-            description: ContainerScaleStatus contains the resources patched by the
-              `Contention Manager` according to the available node resources and other
-              pods' SLA
+            description: PodScaleStatus contains the resources patched by the `Contention
+              Manager` according to the available node resources and other pods' SLA
             properties:
               actual:
                 additionalProperties:

config/permissions/podscale-controller.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: containerscale-controller
+  name: podscale-controller
   namespace: kube-system
 automountServiceAccountToken: false
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: system-autoscaler:containerscale-manager
+  name: system-autoscaler:podscale-manager
 rules:
 - apiGroups: [""]
   resources: ["pods", "services", "nodes"]
@@ -20,19 +20,19 @@ rules:
   resources: ["servicelevelagreements"]
   verbs: ["get", "watch", "list"]
 - apiGroups: ["systemautoscaler.polimi.it"]
-  resources: ["containerscales"]
+  resources: ["podscales"]
   verbs: ["*"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: system-autoscaler:containerscale-manager
+  name: system-autoscaler:podscale-manager
 subjects:
 - kind: ServiceAccount
-  name: containerscale-controller
+  name: podscale-controller
   namespace: kube-system
   apiGroup: ""
 roleRef:
   kind: ClusterRole
-  name: system-autoscaler:containerscale-manager
+  name: system-autoscaler:podscale-manager
   apiGroup: rbac.authorization.k8s.io

examples/benchmark/deploy.sh

@@ -6,6 +6,6 @@ kubectl apply -f application
 kubectl apply -f metrics
 kubectl apply -f system-autoscaler
 
-kubectl cp kube-system/pod-autoscaler-578b5988c8-52brq:var/containerscale.json containerscale.json -c pod-autoscaler
+kubectl cp kube-system/pod-autoscaler-578b5988c8-52brq:var/podscale.json podscale.json -c pod-autoscaler
 kubectl exec postgres-statefulset-0 -- psql -d awesomedb -U amazinguser -c "\copy response_information to /response.csv delimiter ',' csv header;"
 kubectl cp postgres-statefulset-0:response.csv response.csv

examples/benchmark/monitoring/monitoring.yaml

@@ -20,7 +20,7 @@ rules:
     resources: ["servicelevelagreements"]
     verbs: ["get", "watch", "list"]
   - apiGroups: ["systemautoscaler.polimi.it"]
-    resources: ["containerscales"]
+    resources: ["podscales"]
     verbs: ["*"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1

examples/benchmark/system-autoscaler/containerscale-controller.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: containerscale-controller
+  name: podscale-controller
   namespace: kube-system
 automountServiceAccountToken: false
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: system-autoscaler:containerscale-controller
+  name: system-autoscaler:podscale-controller
 rules:
   - apiGroups: [""]
     resources: ["pods", "services", "nodes"]
@@ -20,45 +20,45 @@ rules:
     resources: ["servicelevelagreements"]
     verbs: ["get", "watch", "list"]
   - apiGroups: ["systemautoscaler.polimi.it"]
-    resources: ["containerscales"]
+    resources: ["podscales"]
     verbs: ["*"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: system-autoscaler:containerscale-controller
+  name: system-autoscaler:podscale-controller
 subjects:
   - kind: ServiceAccount
-    name: containerscale-controller
+    name: podscale-controller
     namespace: kube-system
     apiGroup: ""
 roleRef:
   kind: ClusterRole
-  name: system-autoscaler:containerscale-controller
+  name: system-autoscaler:podscale-controller
   apiGroup: rbac.authorization.k8s.io
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: containerscale-controller
+  name: podscale-controller
   namespace: kube-system
 spec:
   strategy:
     type: Recreate
   selector:
     matchLabels:
-      app: containerscale-controller
+      app: podscale-controller
   replicas: 1
   template:
     metadata:
       labels:
-        app: containerscale-controller
+        app: podscale-controller
     spec:
       automountServiceAccountToken: true
-      serviceAccountName: containerscale-controller
+      serviceAccountName: podscale-controller
       containers:
-        - name: containerscale-controller
-          image: systemautoscaler/containerscale-controller:0.1.0
+        - name: podscale-controller
+          image: systemautoscaler/podscale-controller:0.1.0
           imagePullPolicy: Always
           resources:
             limits:

examples/benchmark/system-autoscaler/pod-autoscaler.yaml

@@ -20,7 +20,7 @@ rules:
     resources: ["servicelevelagreements"]
     verbs: ["get", "watch", "list"]
   - apiGroups: ["systemautoscaler.polimi.it"]
-    resources: ["containerscales"]
+    resources: ["podscales"]
     verbs: ["*"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1

examples/podscale-controller.yaml

@@ -1,25 +1,25 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: containerscale-controller
+  name: podscale-controller
   namespace: kube-system
 spec:
   strategy:
     type: Recreate
   selector:
     matchLabels:
-      app: containerscale-controller
+      app: podscale-controller
   replicas: 1
   template:
     metadata:
       labels:
-        app: containerscale-controller
+        app: podscale-controller
     spec:
       automountServiceAccountToken: true
-      serviceAccountName: containerscale-controller
+      serviceAccountName: podscale-controller
       containers:
-      - name: containerscale-controller
-        image: systemautoscaler/containerscale-controller:0.1.0
+      - name: podscale-controller
+        image: systemautoscaler/podscale-controller:0.1.0
         imagePullPolicy: Always
         ports:
         - containerPort: 443

pkg/apis/systemautoscaler/v1beta1/register.go

@@ -32,8 +32,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&ServiceLevelAgreement{},
 		&ServiceLevelAgreementList{},
-		&ContainerScale{},
-		&ContainerScaleList{},
+		&PodScale{},
+		&PodScaleList{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil