Merge branch 'main' into gm/fix-service-annotations

flipt-io · Sep 24, 2024 · d398681 · d398681
2 parents 850bfda + acb9ab5
commit d398681
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 3 deletions.
diff --git a/charts/flipt/Chart.yaml b/charts/flipt/Chart.yaml
@@ -3,8 +3,8 @@ name: flipt
 home: https://flipt.io
 description: Flipt is an open-source, self-hosted feature flag solution.
 type: application
-version: 0.69.3
-appVersion: v1.49.2
+version: 0.70.3
+appVersion: v1.50.0
 maintainers:
   - name: Flipt
     url: https://github.com/flipt-io/helm-charts
diff --git a/charts/flipt/templates/configmap.yaml b/charts/flipt/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-1"

diff --git a/charts/flipt/templates/configmap_ssh.yaml b/charts/flipt/templates/configmap_ssh.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "flipt.fullname" . }}-ssh-known-hosts
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
 data:

diff --git a/charts/flipt/templates/deployment.yaml b/charts/flipt/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
 spec:
@@ -35,6 +36,11 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command: ["/flipt"]
+          {{- if .Values.flipt.args }}
+          args:
+          {{- toYaml .Values.flipt.args | nindent 12 }}
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ coalesce ((.Values.flipt.config).server).http_port .Values.flipt.httpPort .Values.containerPorts.http }}

diff --git a/charts/flipt/templates/hpa.yaml b/charts/flipt/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ include "flipt.apiVersion.autoscaling" . }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
 spec:

diff --git a/charts/flipt/templates/ingress.yaml b/charts/flipt/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

diff --git a/charts/flipt/templates/migration_job.yaml b/charts/flipt/templates/migration_job.yaml
@@ -3,6 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ include "flipt.migration_name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
   annotations:

diff --git a/charts/flipt/templates/pdb.yaml b/charts/flipt/templates/pdb.yaml
@@ -4,6 +4,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels: {{- include "flipt.labels" . | nindent 4 }}
 spec:
   maxUnavailable: {{ default "25%" .Values.pdb.maxUnavailable }} 

diff --git a/charts/flipt/templates/pvc.yaml b/charts/flipt/templates/pvc.yaml
@@ -3,6 +3,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ include "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
   {{- if or .Values.persistence.annotations .Values.commonAnnotations }}

diff --git a/charts/flipt/templates/service.yaml b/charts/flipt/templates/service.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
     {{- with .Values.service.labels }}

diff --git a/charts/flipt/templates/serviceaccount.yaml b/charts/flipt/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "flipt.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}

diff --git a/charts/flipt/templates/servicemonitor.yaml b/charts/flipt/templates/servicemonitor.yaml
@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "flipt.fullname" . }}
   {{- with .Values.metrics.serviceMonitor.namespace }}
-  namespace: {{ . }}
+  namespace: {{ .Release.Namespace }}
   {{- end }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}

diff --git a/charts/flipt/values.yaml b/charts/flipt/values.yaml
@@ -137,6 +137,7 @@ flipt:
   # grpcPort is the Flipt GRPC container port
   # @deprecated use containerPorts.grpc instead
   grpcPort: 9000
+  args: []
   # extraEnvVars is a list of extra environment variables to set e.g.
   # - name: FLIPT_LOG_LEVEL
   #   value: debug