Expose DeploymentOverrides and ServiceOverrides in Helm values (#448)

* Expose DeploymentOverrides and ServiceOverrides in values.yaml * generate values.yaml * update cmd_test.go
solo-io · May 23, 2023 · c3d88a0 · c3d88a0
1 parent 370acaa
commit c3d88a0
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 4 deletions.
diff --git a/changelog/v0.30.1/expose-overrides-fields.yaml b/changelog/v0.30.1/expose-overrides-fields.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/9345
+    resolvesIssue: false
+    description: >
+      "Expose DeploymentOverrides and ServiceOverrides in values.yaml"
diff --git a/codegen/cmd_test.go b/codegen/cmd_test.go
@@ -237,9 +237,9 @@ var _ = Describe("Cmd", func() {
 
 		painterNode := node.Content[0].Content[1]
 		enabledMapField := painterNode.Content[0]
-		Expect(enabledMapField.HeadComment).To(Equal("# Enable creation of the deployment/service."))
+		Expect(enabledMapField.HeadComment).To(Equal("# Arbitrary overrides for the component's [deployment\n# template](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/deployment-v1/)"))
 		envMapField := painterNode.Content[2]
-		Expect(envMapField.HeadComment).To(Equal("# Environment variables for the container. For more info, see the [Kubernetes\n# documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#envvarsource-v1-core)."))
+		Expect(envMapField.HeadComment).To(Equal("# Enable creation of the deployment/service."))
 	})
 
 	It("generates from templates using a name override", func() {

diff --git a/codegen/model/values/helm_chart_values.go b/codegen/model/values/helm_chart_values.go
@@ -63,8 +63,8 @@ type UserValues struct {
 	ServicePorts   map[string]uint32              `json:"ports" desc:"Service ports as a map from port name to port number."`
 
 	// Overrides which can be set by the user
-	DeploymentOverrides *appsv1.Deployment `json:"deploymentOverrides,omitempty" desc:"Arbitrary overrides for the component's [deployment template](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/deployment-v1/)" omitChildren:"true"`
-	ServiceOverrides    *v1.Service        `json:"serviceOverrides,omitempty" desc:"Arbitrary overrides for the component's [service template](https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/)." omitChildren:"true"`
+	DeploymentOverrides *appsv1.Deployment `json:"deploymentOverrides" desc:"Arbitrary overrides for the component's [deployment template](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/deployment-v1/)" omitChildren:"true"`
+	ServiceOverrides    *v1.Service        `json:"serviceOverrides" desc:"Arbitrary overrides for the component's [service template](https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/)." omitChildren:"true"`
 
 	Enabled bool `json:"enabled" desc:"Enable creation of the deployment/service."`
 }

diff --git a/codegen/test/chart-envvars/values.yaml b/codegen/test/chart-envvars/values.yaml
@@ -1,6 +1,7 @@
 # Code generated by skv2. DO NOT EDIT.
 
 painter:
+  deploymentOverrides: null
   enabled: true
   env: null
   extraEnvs: {}
@@ -12,6 +13,7 @@ painter:
     tag: v0.0.0
   ports: {}
   runAsUser: 10101
+  serviceOverrides: null
   serviceType: ""
   sidecars: {}
 
diff --git a/codegen/test/chart-no-desc/values.yaml b/codegen/test/chart-no-desc/values.yaml
@@ -1,6 +1,7 @@
 # Code generated by skv2. DO NOT EDIT.
 
 painter:
+  deploymentOverrides: null
   enabled: true
   env:
     - name: FOO
@@ -14,6 +15,7 @@ painter:
     tag: v0.0.0
   ports: {}
   runAsUser: 10101
+  serviceOverrides: null
   serviceType: ""
   sidecars:
     palette:

diff --git a/codegen/test/chart-sidecar/values.yaml b/codegen/test/chart-sidecar/values.yaml
@@ -1,6 +1,7 @@
 # Code generated by skv2. DO NOT EDIT.
 
 painter:
+  deploymentOverrides: null
   enabled: true
   env: null
   extraEnvs: {}
@@ -12,6 +13,7 @@ painter:
     tag: v0.0.0
   ports: {}
   runAsUser: 10101
+  serviceOverrides: null
   serviceType: ""
   sidecars:
     fooBar:

diff --git a/codegen/test/chart/values.yaml b/codegen/test/chart/values.yaml
@@ -1,6 +1,7 @@
 # Code generated by skv2. DO NOT EDIT.
 
 painter:
+  deploymentOverrides: null
   enabled: true
   env:
     - name: FOO
@@ -14,6 +15,7 @@ painter:
     tag: v0.0.0
   ports: {}
   runAsUser: 10101
+  serviceOverrides: null
   serviceType: ""
   sidecars:
     palette:

diff --git a/codegen/test/name_override_chart/values.yaml b/codegen/test/name_override_chart/values.yaml
@@ -1,6 +1,9 @@
 # Code generated by skv2. DO NOT EDIT.
 
 overrideName:
+  # Arbitrary overrides for the component's [deployment
+  # template](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/deployment-v1/)
+  deploymentOverrides: null
   # Enable creation of the deployment/service.
   enabled: true
   # Environment variables for the container. For more info, see the [Kubernetes
@@ -25,6 +28,9 @@ overrideName:
   ports: {}
   # Static user ID to run the containers as. Unused if floatingUserId is 'true'.
   runAsUser: 10101
+  # Arbitrary overrides for the component's [service
+  # template](https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/).
+  serviceOverrides: null
   # Kubernetes service type. Can be either "ClusterIP", "NodePort", "LoadBalancer",
   # or "ExternalName".
   serviceType: ""