fix(helm/coder): set serviceAccount.disableCreate=false by default, add tests (coder#15197)

johnstcn · web-flow · commit fed70bdeb843 · 2024-10-23T21:11:02.000+01:00
* Sets `serviceaccount.disableCreate=false` by default (accidentally changed by coder#14817) * Reverts changes made in coder#15196
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -90,6 +90,7 @@ jobs:
               - "coderd/**"
               - "enterprise/**"
               - "examples/*"
+              - "helm/**"
               - "provisioner/**"
               - "provisionerd/**"
               - "provisionersdk/**"
diff --git a/helm/coder/tests/chart_test.go b/helm/coder/tests/chart_test.go
@@ -88,6 +88,10 @@ var testCases = []testCase{
 		name:          "sa_extra_rules",
 		expectedError: "",
 	},
+	{
+		name:          "sa_disabled",
+		expectedError: "",
+	},
 }
 
 type testCase struct {
diff --git a/helm/coder/tests/testdata/auto_access_url_1.golden b/helm/coder/tests/testdata/auto_access_url_1.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/auto_access_url_2.golden b/helm/coder/tests/testdata/auto_access_url_2.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/auto_access_url_3.golden b/helm/coder/tests/testdata/auto_access_url_3.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/command.golden b/helm/coder/tests/testdata/command.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/command_args.golden b/helm/coder/tests/testdata/command_args.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/default_values.golden b/helm/coder/tests/testdata/default_values.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/env_from.golden b/helm/coder/tests/testdata/env_from.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/extra_templates.golden b/helm/coder/tests/testdata/extra_templates.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/extra-templates.yaml
 apiVersion: v1
 kind: ConfigMap
@@ -92,7 +106,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/labels_annotations.golden b/helm/coder/tests/testdata/labels_annotations.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/prometheus.golden b/helm/coder/tests/testdata/prometheus.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -84,7 +98,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/provisionerd_psk.golden b/helm/coder/tests/testdata/provisionerd_psk.golden
@@ -1,4 +1,18 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +97,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/sa.golden b/helm/coder/tests/testdata/sa.golden
@@ -1,4 +1,19 @@
 ---
+# Source: coder/templates/coder.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations:
+    eks.amazonaws.com/role-arn: arn:aws:iam::123456789012:role/coder-service-account
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: coder
+    app.kubernetes.io/part-of: coder
+    app.kubernetes.io/version: 0.1.0
+    helm.sh/chart: coder-0.1.0
+  name: coder-service-account
+---
 # Source: coder/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -83,7 +98,6 @@ spec:
     app.kubernetes.io/instance: release-name
 ---
 # Source: coder/templates/coder.yaml
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/helm/coder/tests/testdata/sa_disabled.golden b/helm/coder/tests/testdata/sa_disabled.golden
diff --git a/helm/coder/tests/testdata/sa_disabled.yaml b/helm/coder/tests/testdata/sa_disabled.yaml
diff --git a/helm/coder/tests/testdata/sa_extra_rules.golden b/helm/coder/tests/testdata/sa_extra_rules.golden
diff --git a/helm/coder/tests/testdata/tls.golden b/helm/coder/tests/testdata/tls.golden
diff --git a/helm/coder/tests/testdata/workspace_proxy.golden b/helm/coder/tests/testdata/workspace_proxy.golden
diff --git a/helm/coder/values.yaml b/helm/coder/values.yaml
