Skip to content

Commit

Permalink
Merge pull request #1425 from mloiseleur/feat/namespace
Browse files Browse the repository at this point in the history
fix(helm-chart): ensure helm release namespace is applied
  • Loading branch information
akselleirv authored Sep 15, 2024
2 parents cb032d4 + 89c374f commit 4356c62
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "tofu-controller.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "tofu-controller.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
Expand Down
2 changes: 2 additions & 0 deletions charts/tofu-controller/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ metadata:
labels:
{{- include "tofu-controller.labels" . | nindent 4 }}
name: {{ include "tofu-controller.fullname" . }}
namespace: {{ .Release.Namespace }}

spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand Down
1 change: 1 addition & 0 deletions charts/tofu-controller/templates/metrics-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "tofu-controller.fullname" . }}-metrics-service
namespace: {{ .Release.Namespace }}
labels:
{{- include "tofu-controller.labels" . | nindent 4 }}
spec:
Expand Down
1 change: 1 addition & 0 deletions charts/tofu-controller/templates/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: OCIRepository
metadata:
name: aws-package
namespace: {{ .Release.Namespace }}
annotations:
metadata.weave.works/description: "This is the AWS package containing primitive modules for flux-iac tofu-controller."
metadata.weave.works/docs-url: "https://github.com/flux-iac/aws-primitive-modules"
Expand Down
1 change: 1 addition & 0 deletions charts/tofu-controller/templates/planner-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
labels:
{{- include "planner.labels" . | nindent 4 }}
name: {{ include "planner.fullname" . }}
namespace: {{ .Release.Namespace }}
spec:
# Planner can't be scaled yet.
replicas: 1
Expand Down

0 comments on commit 4356c62

Please sign in to comment.