Resolve merge conflicts (#1242)

Signed-off-by: Njegos Railic <railic.njegos@gmail.com> Co-authored-by: Rita Zhang <rita.z.zhang@gmail.com>
open-policy-agent · Apr 15, 2021 · 2ea6388 · 2ea6388
1 parent 65c3f85
commit 2ea6388
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 76 deletions.
diff --git a/cmd/build/helmify/kustomize-for-helm.yaml b/cmd/build/helmify/kustomize-for-helm.yaml
@@ -3,6 +3,8 @@ kind: Service
 metadata:
   name: gatekeeper-webhook-service
   namespace: gatekeeper-system
+spec:
+  HELMSUBST_SERVICE_TYPE: ""
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition

diff --git a/cmd/build/helmify/replacements.go b/cmd/build/helmify/replacements.go
@@ -41,4 +41,11 @@ var replacements = map[string]string{
     {{- end}}`,
 
 	"HELMSUBST_PDB_CONTROLLER_MANAGER_MINAVAILABLE": `{{ .Values.pdb.controllerManager.minAvailable }}`,
+
+	`HELMSUBST_SERVICE_TYPE: ""`: `{{- if .Values.service }}
+  type: {{  .Values.service.type | default "ClusterIP" }}
+    {{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+    {{- end }}
+  {{- end }}`,
 }
diff --git a/cmd/build/helmify/static/README.md b/cmd/build/helmify/static/README.md
diff --git a/cmd/build/helmify/static/values.yaml b/cmd/build/helmify/static/values.yaml
@@ -69,3 +69,4 @@ audit:
 pdb:
   controllerManager:
     minAvailable: 1
+service: {}
diff --git a/manifest_staging/charts/gatekeeper/README.md b/manifest_staging/charts/gatekeeper/README.md
diff --git a/manifest_staging/charts/gatekeeper/templates/gatekeeper-webhook-service-service.yaml b/manifest_staging/charts/gatekeeper/templates/gatekeeper-webhook-service-service.yaml
@@ -10,6 +10,12 @@ metadata:
   name: gatekeeper-webhook-service
   namespace: '{{ .Release.Namespace }}'
 spec:
+  {{- if .Values.service }}
+  type: {{  .Values.service.type | default "ClusterIP" }}
+    {{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+    {{- end }}
+  {{- end }}
   ports:
   - port: 443
     targetPort: 8443

diff --git a/manifest_staging/charts/gatekeeper/values.yaml b/manifest_staging/charts/gatekeeper/values.yaml
@@ -69,3 +69,4 @@ audit:
 pdb:
   controllerManager:
     minAvailable: 1
+service: {}