Feat/autostopping v2 (#5)

* feat/autostopping-v2

* feat/autostopping-v2

* update discovery values and svc

* update discovery values and svc

* update notes

* 0.2.0-rc1

* readme

Author: rssnyder

.gitignore

@@ -1 +1,2 @@
-Makefile
+Makefile
+*.values.yaml

charts/harness-ccm-autostopping/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.4
+version: 0.2.0-rc1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.2.1"
+appVersion: "2.0.0"

charts/harness-ccm-autostopping/README.md

@@ -28,11 +28,21 @@ helm upgrade -i harness-autostopping --namespace harness-autostopping --create-n
 - connectorId: the ID for the CCM K8s connector for this cluster
 - apiToken: a Harness API key with at least ccm:admin for all account level resources
 
-## troubleshooting
 
-to turn on debug logging, you can set the following values:
+### cluster orchestrator
+
+if you are also using cluster orchestrator, you will need to add annotations for spot nodes:
 ```yaml
-router.logLevel: debug
+discovery:
+  tolerations:
+    - effect: NoSchedule
+      key: ccm.harness.io/spot-ready
+      value: Ready
+      effect: "NoSchedule"
+    - key: "compute"
+      operator: "Equal"
+      value: "dedicated"
+      effect: "NoSchedule"
 ```
 
 ## development notes
@@ -41,7 +51,7 @@ things that must be hard-coded:
 
 namespace: `harness-autostopping`
 
-service name for router: `autostopping-router`
+deployment name for progress watcher: `progress-agent`
 
 service name for controller: `autostopping-controller` (therefor also hard-coded in the router configmap)
 

charts/harness-ccm-autostopping/templates/NOTES.txt

@@ -6,13 +6,19 @@ You can now create autostopping rules:
     name: <autostopping rule name>
     namespace: <namespace of your k8s application>
     annotations:
-    harness.io/cloud-connector-id: <any cloud ccm connector id with autostopping enabled>
+      harness.io/cloud-connector-id: <any cloud ccm connector id with autostopping enabled>
   spec:
-    service:  
-      name: <replace with your service name>
-      port: 80
-    ingress:
-      name: <replace with ingress name>
-      controllerName: nginx
-    idleTimeMins: 15
-    hideProgressPage: false
+    idleTimeMins: 5
+    hideProgressPage: false
+    workloads:
+      <autostopping rule name>:
+        namespace: <namespace of your k8s application>
+        name: <autostopping rule name>
+        id: <autostopping rule name>
+        desired: <desired number of replicas>
+        type: <k8s resource type>
+        warmup_delay_sec: 0
+        traffic_routes:
+          - service_name: <k8s service name>
+            service_port: <k8s service port>
+    dependencies: []

charts/harness-ccm-autostopping/templates/_helpers.tpl

@@ -51,10 +51,17 @@ app.kubernetes.io/component: {{ include "harness-ccm-autostopping.name" . }}-con
 {{- end }}
 
 {{/*
-Selector labels for router
+Selector labels for progress-agent
 */}}
-{{- define "harness-ccm-autostopping.router.selectorLabels" -}}
-app.kubernetes.io/component: {{ include "harness-ccm-autostopping.name" . }}-router
+{{- define "harness-ccm-autostopping.progressAgent.selectorLabels" -}}
+app.kubernetes.io/component: {{ include "harness-ccm-autostopping.name" . }}-progress-agent
+{{- end }}
+
+{{/*
+Selector labels for sd-node
+*/}}
+{{- define "harness-ccm-autostopping.sdNode.selectorLabels" -}}
+app.kubernetes.io/component: {{ include "harness-ccm-autostopping.name" . }}-sd-node
 {{- end }}
 
 {{/*
@@ -68,14 +75,28 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
+{{/*
+Create the name of the discovery service account to use
+*/}}
+{{- define "harness-ccm-autostopping.discoveryServiceAccountName" -}}
+{{- if .Values.discovery.serviceAccount.create }}
+{{- default (include "harness-ccm-autostopping.fullname" .) .Values.discovery.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.discovery.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
 {{/*
 Define resource names
 */}}
 {{- define "harness-ccm-autostopping.controller.name" -}}
 {{- include "harness-ccm-autostopping.fullname" . }}-controller
 {{- end }}
-{{- define "harness-ccm-autostopping.router.name" -}}
-{{- include "harness-ccm-autostopping.fullname" . }}-router
+{{- define "harness-ccm-autostopping.progressAgent.name" -}}
+{{- include "harness-ccm-autostopping.fullname" . }}-progress-agent
+{{- end }}
+{{- define "harness-ccm-autostopping.sdNode.name" -}}
+{{- include "harness-ccm-autostopping.fullname" . }}-sd-node
 {{- end }}
 
 {{/*

charts/harness-ccm-autostopping/templates/clusterrole.yaml

@@ -1,28 +1,5 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
-metadata:
-  name: {{ include "harness-ccm-autostopping.fullname" . }}-secret-reader
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "harness-ccm-autostopping.labels" . | nindent 4 }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-      - configmaps
-    verbs:
-      - get
-      - list
-      - watch
-      - create
-      - patch
-      - delete
-      - update
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
 metadata:
   name: {{ include "harness-ccm-autostopping.fullname" . }}
 rules:
@@ -93,4 +70,7 @@ rules:
       - events
     verbs:
       - create
-      - patch
+      - patch
+
+
+

charts/harness-ccm-autostopping/templates/clusterrolebinding.yaml

@@ -1,21 +1,5 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
-metadata:
-  name: {{ include "harness-ccm-autostopping.fullname" . }}-secret-reader
-  labels:
-    {{- include "harness-ccm-autostopping.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "harness-ccm-autostopping.fullname" . }}-secret-reader
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "harness-ccm-autostopping.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
 metadata:
   name: {{ include "harness-ccm-autostopping.fullname" . }}
 roleRef:

charts/harness-ccm-autostopping/templates/controller-deployment.yaml

@@ -32,21 +32,26 @@ spec:
         - name: {{ include "harness-ccm-autostopping.controller.name" . }}
           securityContext:
             {{- toYaml .Values.controller.securityContext | nindent 12 }}
-          image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command:
+          - 'operator'
           env:
           - name: HARNESS_API
             value: https://{{ .Values.harnessUrl }}/gateway/lw/api
           - name: CONNECTOR_ID
             value: {{ .Values.connectorId }}
           - name: REMOTE_ACCOUNT_ID
             value: {{ .Values.accountId }}
+          - name: PROGRESS_PAGE_AGENT_SVC
+            value: {{ include "harness-ccm-autostopping.progressAgent.name" . }}
+          - name: PROGRESS_PAGE_AGENT_PORT
+            value: "8290"
+          - name: PROGRESS_PAGE_AGENT_NS
+            value: {{ .Release.Namespace }}
+          - name: ENABLE_TRAFFIC_DETECTION
+            value: "true"
           ports:
-          - containerPort: 18000
-            name: envoy-snapshot
-          - containerPort: 8093
-            protocol: TCP
-            name: progress
           - containerPort: 9443
             protocol: TCP
             name: webhook

charts/harness-ccm-autostopping/templates/controller-service.yaml

@@ -8,13 +8,6 @@ metadata:
     {{- include "harness-ccm-autostopping.labels" . | nindent 4 }}
 spec:
   ports:
-  - port: 18000
-    protocol: TCP
-    name: envoy-snapshot
-  - port: 80
-    protocol: TCP
-    targetPort: 8093
-    name: progress
   - port: 9443
     protocol: TCP
     targetPort: 9443

charts/harness-ccm-autostopping/templates/discovery-clusterrole.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "harness-ccm-autostopping.fullname" . }}-discovery
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - services
+  - nodes
+  verbs:
+  - watch
+  - list
+  - get