Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Bind resources to the namespace #365

Merged
merged 3 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/helm-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ jobs:
output_format: cli,sarif
output_file_path: console,results.sarif
soft_fail: true
env:
HELM_NAMESPACE: no-default-namespace

- name: Template chart
# temporary disabled due to https://github.com/zegl/kube-score/issues/559
Expand Down
1 change: 1 addition & 0 deletions helm/flowforge/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: flowforge-config
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
data:
Expand Down
1 change: 1 addition & 0 deletions helm/flowforge/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: flowforge
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
{{- with .Values.forge.labels }}
Expand Down
1 change: 0 additions & 1 deletion helm/flowforge/templates/file-storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: file-storage-pvc
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
spec:
Expand Down
1 change: 0 additions & 1 deletion helm/flowforge/templates/network-policy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: flowforge-database-policy
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
spec:
Expand Down
1 change: 0 additions & 1 deletion helm/flowforge/templates/private-ca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certs"}}
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
data:
Expand Down
5 changes: 3 additions & 2 deletions helm/flowforge/templates/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: flowforge
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
{{- if .Values.forge.cloudProvider }}
Expand Down Expand Up @@ -34,6 +35,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ ((.Values.forge).clusterRole).name | default "create-pod" }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
rules:
Expand All @@ -60,13 +62,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ ((.Values.forge).clusterRole).name | default "create-pod" }}
namespace: {{ .Values.forge.projectNamespace }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
subjects:
- kind: ServiceAccount
name: flowforge
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: {{ ((.Values.forge).clusterRole).name | default "create-pod" }}
Expand Down
3 changes: 3 additions & 0 deletions helm/flowforge/templates/service-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: forge
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
spec:
Expand All @@ -17,6 +18,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: flowforge-ingress
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
annotations:
Expand Down Expand Up @@ -53,6 +55,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: flowforge-ingress-api-devices
namespace: {{ .Release.Namespace }}
labels:
{{- include "forge.labels" . | nindent 4 }}
annotations:
Expand Down
Loading