Rename and re-organize resources (#45)

* Rename and re-organize resources

* Add changeset

charts/kubernetes-agent/.changeset/perfect-shrimps-tap.md

@@ -0,0 +1,5 @@
+---
+"kubernetes-agent": patch
+---
+
+Rename resources to use octopus-agent as default

charts/kubernetes-agent/templates/_helpers.tpl

@@ -1,26 +1,9 @@
 {{/*
-Expand the name of the chart.
-*/}}
-{{- define "kubernetes-agent.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
+The name for the agent
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
 */}}
-{{- define "kubernetes-agent.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
+{{- define "kubernetes-agent.name" -}}
+{{ .Values.nameOverride | default "octopus-agent" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -30,7 +13,6 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-
 {{/*
 Common labels
 */}}
@@ -55,32 +37,43 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Create the name of the service account to use
 */}}
 {{- define "kubernetes-agent.serviceAccountName" -}}
-{{- default (include "kubernetes-agent.fullname" .) .Values.jobServiceAccount.name }}
+{{- .Values.serviceAccount.name | default (printf "%s-tentacle" (include "kubernetes-agent.name" .)) }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
 {{- define "kubernetes-agent.jobServiceAccountName" -}}
-{{- default (printf "%s-job" (include "kubernetes-agent.fullname" .)) .Values.serviceAccount.name }}
+{{- .Values.jobServiceAccount.name | default (printf "%s-job" (include "kubernetes-agent.name" .)) }}
+{{- end }}
+
+
+{{/*
+Used for the job cluster role & clusterrole binding as they are not namespaced.
+*/}}
+{{- define "kubernetes-agent.jobServiceAccountFullName" -}}
+{{- printf "%s-%s" ( include "kubernetes-agent.jobServiceAccountName" .) .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Create the name of the job cluster role to use
 */}}
 {{- define "kubernetes-agent.jobClusterRoleName" -}}
-{{- printf "%s-role" (include "kubernetes-agent.jobServiceAccountName" .) }}
+{{- printf "%s-role" (include "kubernetes-agent.jobServiceAccountFullName" .) }}
 {{- end }}
 
 {{/*
 Create the name of the job cluster role binding to use
 */}}
 {{- define "kubernetes-agent.jobClusterRoleBindingName" -}}
-{{- printf "%s-binding" (include "kubernetes-agent.jobServiceAccountName" .) }}
+{{- printf "%s-binding" (include "kubernetes-agent.jobServiceAccountFullName" .) }}
 {{- end }}
 
+{{/*
+The name of the secret to store the authentication information (bearer token/api key)
+*/}}
 {{- define "kubernetes-agent.secrets.serverAuth" -}}
-{{- printf "%s-server-auth" ( include "kubernetes-agent.fullname" . ) }}
+{{- printf "%s-tentacle-server-auth" ( include "kubernetes-agent.name" . ) }}
 {{- end }}
 
 {{- define "kubernetes-agent.jobVolumeYaml" -}}

charts/kubernetes-agent/templates/job-serviceaccount.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "kubernetes-agent.jobServiceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "kubernetes-agent.labels" . | nindent 4 }}
   {{- with .Values.jobServiceAccount.annotations }}

charts/kubernetes-agent/templates/nfs-deployment.yaml

@@ -2,30 +2,29 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ printf "%s-nfs" (include "kubernetes-agent.fullname" .) }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ printf "%s-nfs" (include "kubernetes-agent.name" .) }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
-    app.kubernetes.io/name: {{ printf "%s-nfs" (include "kubernetes-agent.fullname" .) }}
+    app.kubernetes.io/name: {{ printf "%s-nfs" (include "kubernetes-agent.name" .) }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-        app.kubernetes.io/name: {{ printf "%s-nfs" (include "kubernetes-agent.fullname" .) }}
+        app.kubernetes.io/name: {{ printf "%s-nfs" (include "kubernetes-agent.name" .) }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app.kubernetes.io/name: {{ printf "%s-nfs" (include "kubernetes-agent.fullname" .) }}
+        app.kubernetes.io/name: {{ printf "%s-nfs" (include "kubernetes-agent.name" .) }}
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
-      serviceAccountName: {{ include "kubernetes-agent.serviceAccountName" . }}
       containers:
-        - name: {{ printf "%s-nfs" .Chart.Name }}
+        - name: {{ printf "%s-nfs" (include "kubernetes-agent.name" .) }}
           image: "itsthenetwork/nfs-server-alpine:latest{{ .Values.development.nfs.useArmContainer | ternary "-arm" "" }}"
           securityContext:
             privileged: true

charts/kubernetes-agent/templates/nfs-service.yaml

@@ -2,13 +2,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ printf "%s-nfs-svc" (include "kubernetes-agent.fullname" .) }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ printf "%s-nfs" (include "kubernetes-agent.name" .) }}
+  namespace: {{ .Release.Namespace | quote }}
 spec:
   type: ClusterIP
   clusterIP: {{ .Values.storage.nfsPort }}
   selector:
-    app.kubernetes.io/name: {{ printf "%s-nfs" (include "kubernetes-agent.fullname" .) }}
+    app.kubernetes.io/name: {{ printf "%s-nfs" (include "kubernetes-agent.name" .) }}
   ports:
     - name: nfs
       port: 2049

charts/kubernetes-agent/templates/service.yaml

@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "kubernetes-agent.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "kubernetes-agent.name" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "kubernetes-agent.labels" . | nindent 4 }}
 spec:

charts/kubernetes-agent/templates/deployment.yaml → charts/kubernetes-agent/templates/tentacle-deployment.yaml

@@ -1,8 +1,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "kubernetes-agent.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  name: {{printf "%s-tentacle" (include "kubernetes-agent.name" .) }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "kubernetes-agent.labels" . | nindent 4 }}
 spec:
@@ -32,7 +32,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
-        - name: {{ .Chart.Name }}
+        - name: {{printf "%s-tentacle" (include "kubernetes-agent.name" .) }}
           {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}

charts/kubernetes-agent/templates/tentacle-role.yaml

@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ printf "%s-role" (include "kubernetes-agent.serviceAccountName" .) }}
+  namespace: {{ .Release.Namespace | quote }}
+rules:
+- apiGroups: ["*"]
+  resources: ["jobs"]
+  verbs: ["*"]
+- apiGroups: ["*"]
+  resources: ["configmaps"]
+  verbs: ["*"]
+- apiGroups: ["*"]
+  resources: ["secrets"]
+  verbs: ["*"]

charts/kubernetes-agent/templates/tentacle-rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ printf "%s-binding" (include "kubernetes-agent.serviceAccountName" .) }}
+  namespace: {{ .Release.Namespace | quote }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "kubernetes-agent.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
+roleRef:
+  kind: Role
+  name: {{ printf "%s-role" (include "kubernetes-agent.serviceAccountName" .) }}
+  apiGroup: rbac.authorization.k8s.io

charts/kubernetes-agent/templates/secrets.yaml → charts/kubernetes-agent/templates/tentacle-server-auth-secret.yaml

@@ -2,11 +2,12 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "kubernetes-agent.secrets.serverAuth" . }}
+  namespace: {{ .Release.Namespace | quote }}
 type: Opaque
 data:
 {{- with .Values.tentacle.bearerToken }}
   bearer-token: {{ . | b64enc }}
 {{- end }}  
 {{- with .Values.tentacle.serverApiKey }}
   api-key: {{ . | b64enc }}
-{{- end }}
+{{- end }}

charts/kubernetes-agent/templates/tentacle-serviceaccount.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "kubernetes-agent.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "kubernetes-agent.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: true

charts/kubernetes-agent/values.yaml

@@ -29,7 +29,6 @@ storage:
 
 imagePullSecrets: []
 nameOverride: ""
-fullnameOverride: ""
 
 serviceAccount:
   # The name of the service account to use.
@@ -85,4 +84,4 @@ volumeMounts: []
 
 development:
   nfs:
-    useArmContainer: false
+    useArmContainer: false