Merge pull request #4 from control-theory/env_agent_id

use config map

Author: rbg

charts/ct-agent/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: ct-agent
 description: ControlTheory Kubernetes Agent
 type: application
-version: 0.1.4
+version: 0.1.5
 appVersion: "1.1.0"

charts/ct-agent/templates/cluster_role.yaml

@@ -17,7 +17,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
-    name: {{ .Values.serviceAccount.name }}
+    name: {{ .Release.Name }}-sa
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole

charts/ct-agent/templates/config_map.yaml

@@ -1,35 +1,9 @@
+{{- $configMapName := printf "%s-agentid" .Release.Name }}
+{{- $existing := lookup "v1" "ConfigMap" .Release.Namespace $configMapName }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-config
-  labels:
-    app: {{ .Release.Name }}
+  name: {{ $configMapName }}
+  namespace: {{ .Release.Namespace }}
 data:
-  config.yaml: |
-    debug: true
-    server:
-      admission_token: {{ .Values.deployment.controlplane.admission_token }}
-      # point to the OpAMP Server
-      endpoint: {{ .Values.deployment.controlplane.endpoint }}
-      tls:
-        insecure: true
-        # Disable verification to test locally.
-        # Don't do this in production.
-        insecure_skip_verify: true
-        # For more TLS settings see config/configtls.ClientConfig
-
-    capabilities:
-      reports_effective_config: true
-      reports_own_metrics: true
-      reports_health: true
-      accepts_remote_config: true
-      reports_remote_config: true
-
-    agent:
-      executable: /ctotel
-      args:
-        - --config
-        - /data/effective.yaml
-
-    storage:
-      directory: /data
+  instance_uid: {{ if $existing }}{{ index $existing.data "instance_uid" }}{{ else }}{{ uuidv4 }}{{ end }}

charts/ct-agent/templates/deployment.yaml

@@ -16,21 +16,8 @@ spec:
         app: {{ .Release.Name }}
     spec:
 {{- if .Values.serviceAccount.create }}
-      serviceAccountName: {{ .Values.serviceAccount.name }}
+      serviceAccountName: {{ .Release.Name }}-sa
 {{- end }}
-{{- if .Values.imagePullSecret }}
-      imagePullSecrets:
-        - name: {{ .Values.imagePullSecret }}
-{{- end }}
-      volumes:
-{{- if .Values.deployment.pvc }}
-        - name: storage-volume
-          persistentVolumeClaim:
-            claimName: {{ .Release.Name }}-pvc
-{{- end }}
-        - name: config-volume
-          configMap:
-            name: {{ .Release.Name }}-config
       containers:
       - name: {{ .Release.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag}}"
@@ -52,33 +39,31 @@ spec:
           - {{ . | quote }}
           {{- end }}
 {{- end }}
-{{- if  .Values.deployment.controlplane }}
+
         env:
+          - name: AGENT_INSTANCE_ID
+            valueFrom:
+              configMapKeyRef:
+                name: {{ .Release.Name }}-agentid
+                key: instance_uid          
+{{- if  .Values.deployment.controlplane }}
           - name: CONTROLPLANE_ENDPOINT
             value: "{{ .Values.deployment.controlplane.endpoint }}"
           - name: ADMISSION_TOKEN
             value: "{{ .Values.deployment.controlplane.admission_token }}"
+{{- end }}
         {{- range $name, $value := .Values.deployment.env }}
           - name: {{ $name }}
             value: "{{ $value }}"
         {{- end }}
-{{- end }}
-        volumeMounts:
-{{- if .Values.deployment.pvc }}
-          - name: storage-volume
-            mountPath: /data
-{{- end }}
-          - name: config-volume
-            mountPath: /var/ct
-            readOnly: true
         ports:
           - name: {{ .Release.Name }}-http
             containerPort: {{ .Values.service.otelhttp.port  }}
           - name: {{ .Release.Name }}-grpc
             containerPort: {{ .Values.service.otelgrpc.port  }}
           - name: {{ .Release.Name }}-sd
             containerPort: {{ .Values.service.statsd.port  }}
-{{- if .Values.deployment.nodegroup }}
+{{- if .Values.deployment.nodeSelector }}
       nodeSelector:
-          alpha.eksctl.io/nodegroup-name: "{{ .Values.deployment.nodegroup }}"
-{{- end }}
+        {{- toYaml .Values.deployment.nodeSelector | nindent 2 }}
+{{- end }}

charts/ct-agent/templates/pvc.yaml

@@ -2,7 +2,8 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "..serviceAccountName" . }}
+  name: {{ .Release.Name }}-sa
+  namespace: {{ .Release.Namespace }}  
   labels:
     {{- include "..labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}

charts/ct-agent/templates/serviceaccount.yaml

@@ -8,14 +8,11 @@ deployment:
   controlplane:
     admission_token: "you-need-to-provide-it"
     endpoint: "ws://controlplane:4320/v1/opamp"
-  pvc:
-    enabled: true
-    accessMode: ReadWriteOnce
-    size: 4Gi
   args:
     - --config
     - /config.yaml
-
+#  nodeSelector:
+#    node-role.kubernetes.io/agent: ""
 resources:
   enabled: true
   cpu:
@@ -27,7 +24,6 @@ resources:
 
 serviceAccount:
   create: true
-  name: otel-collector-admin
 
 service:
   otelhttp: