Merge branch 'master' into vpa-support

stakater · Jul 6, 2023 · 1ec1725 · 1ec1725
2 parents 9faf3ad + 11076d2
commit 1ec1725
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,15 @@
 
 All notable changes to this project will be documented here.
 
-### v2.1.14
+### v2.1.16
 - feat: Add vertical pod autoscaler template [PR-249](https://github.com/stakater/application/pull/249)
 
+### v2.1.15
+- fix: allow setting arbitrary resource constraints [PR-255](https://github.com/stakater/application/pull/255)
+
+### v2.1.14
+- feat: allow overriding clusterIP [PR-258](https://github.com/stakater/application/pull/258)
+
 ### v2.1.13
 - Fix: make deployment.image.tag and job.image.tag optional [PR-234](https://github.com/stakater/application/pull/234)
 

diff --git a/Tiltfile b/Tiltfile
@@ -14,6 +14,12 @@ imc_namespace = "stakater-ingress-monitor-controller"
 namespace_create(imc_namespace)
 helm_resource('imc', 'oci://ghcr.io/stakater/charts/ingress-monitor-controller', namespace=imc_namespace,flags=['--set','developmentMode=true'])
 
+# Install IMC Config
+local_resource(
+    'imc-config',
+    cmd='helm upgrade --install ingress-monitor-controller-config -n {} oci://ghcr.io/stakater/charts/ingress-monitor-controller-config --set developmentMode=true'.format(imc_namespace)
+    )
+
 # Install Forecastle
 forecastle_namespace = "stakater-forecastle"
 namespace_create(forecastle_namespace)

diff --git a/application/Chart.yaml b/application/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 
 # Helm chart Version
 
-version: 2.1.13
+version: 2.1.15
 
 
 keywords:

diff --git a/application/templates/deployment.yaml b/application/templates/deployment.yaml
@@ -246,13 +246,10 @@ spec:
         {{- end }}
         {{- end }}
       {{- end }}
+        {{- with .Values.deployment.resources }}
         resources:
-          limits:
-            memory: {{ .Values.deployment.resources.limits.memory }}
-            cpu: {{ .Values.deployment.resources.limits.cpu }}
-          requests:
-            memory: {{ .Values.deployment.resources.requests.memory }}
-            cpu: {{ .Values.deployment.resources.requests.cpu }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- if .Values.deployment.containerSecurityContext }}
         securityContext:
 {{ toYaml .Values.deployment.containerSecurityContext | indent 10 }}

diff --git a/application/templates/service.yaml b/application/templates/service.yaml
@@ -16,6 +16,9 @@ metadata:
 spec:
 {{- if .Values.service.type }}  
   type: "{{ .Values.service.type }}"
+{{- end }}
+{{- with .Values.service.clusterIP }}
+  clusterIP: {{ . }}
 {{- end }}
   selector:
 {{ include "application.selectorLabels" . | indent 4 }}
@@ -35,4 +38,4 @@ spec:
   {{- else }}
 {{ toYaml .Values.service.ports | indent 4 }}
   {{- end }}
-{{- end }}
+{{- end }}
diff --git a/application/values.yaml b/application/values.yaml
@@ -334,6 +334,9 @@ service:
       targetPort: 8080
   type: ClusterIP
 
+  # Set to 'None' will make this service headless 
+  clusterIP:
+
 ##########################################################
 # Ingress object for exposing services
 ##########################################################