Skip to content

Commit 514f90e

Browse files
committed
helm charts: remove namespace from charts in favour of helm --namespace option and $.Release.Namespace
1 parent a315a4d commit 514f90e

File tree

5 files changed

+1
-13
lines changed

5 files changed

+1
-13
lines changed

ci/helm-chart/templates/deployment.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
name: tarantool-operator
6-
namespace: {{ .Values.namespace }}
76
spec:
87
replicas: 1
98
selector:

ci/helm-chart/values.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
# This is a YAML-formatted file.
33
# Declare variables to be passed into your templates.
44

5-
namespace: tarantool
6-
75
image:
86
repository: tarantool/tarantool-operator
97
tag: 0.0.6

examples/kv/helm-chart/templates/deployment.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apiVersion: tarantool.io/v1alpha1
22
kind: Cluster
33
metadata:
44
name: {{ .Values.ClusterName }}
5-
namespace: {{ .Values.namespace }}
65
spec:
76
selector:
87
matchLabels:
@@ -14,7 +13,6 @@ apiVersion: tarantool.io/v1alpha1
1413
kind: Role
1514
metadata:
1615
name: {{ .RoleName | replace "_" "" }}
17-
namespace: {{ $.Values.namespace }}
1816
labels:
1917
tarantool.io/cluster-id: {{ $.Values.ClusterName }}
2018
tarantool.io/role: {{ .RoleName }}
@@ -30,7 +28,6 @@ apiVersion: tarantool.io/v1alpha1
3028
kind: ReplicasetTemplate
3129
metadata:
3230
name: "{{ .RoleName | replace "_" "" }}-template"
33-
namespace: {{ $.Values.namespace }}
3431
labels:
3532
tarantool.io/cluster-id: {{ $.Values.ClusterName }}
3633
tarantool.io/replicaset-template: "{{ .RoleName }}-template"
@@ -115,7 +112,7 @@ spec:
115112
fieldRef:
116113
fieldPath: metadata.name
117114
- name: TARANTOOL_ADVERTISE_HOST
118-
value: "$(TARANTOOL_ADVERTISE_TMP).{{ $.Values.ClusterName }}.{{ $.Values.namespace }}.svc.cluster.local"
115+
value: "$(TARANTOOL_ADVERTISE_TMP).{{ $.Values.ClusterName }}.{{ $.Release.Namespace }}.svc.cluster.local"
119116
- name: TARANTOOL_ADVERTISE_URI
120117
value: "$(TARANTOOL_ADVERTISE_HOST):3301"
121118
- name: TARANTOOL_PROBE_URI_TIMEOUT
@@ -132,7 +129,6 @@ apiVersion: v1
132129
kind: Service
133130
metadata:
134131
name: {{ .RoleName }}
135-
namespace: {{ $.Values.namespace }}
136132
labels:
137133
tarantool.io/role: {{ .RoleName }}
138134
spec:

examples/kv/helm-chart/values.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
ClusterEnv: dev
44
ClusterName: examples-kv-cluster
55

6-
namespace: tarantool
7-
86
image:
97
repository: tarantool/tarantool-operator-examples-kv
108
tag: 0.0.2

examples/tarantool-data-grid/values.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
ClusterEnv: dev
33
ClusterName: test-app
44

5-
# Installation namespace
6-
namespace: tarantool
7-
85
# Docker image to run
96
image:
107
repository: tdg

0 commit comments

Comments
 (0)