install crud-storage with dependencies

vasiliy-t · Oct 6, 2020 · a370c7a · a370c7a
1 parent 966b7c0
commit a370c7a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -5,18 +5,11 @@
 1. install helm repos
 
   ```shell
-  $ helm repo add tarantool https://tarantool.github.io/tarantool-operator
   $ helm repo add tarantool-examples https://vasiliy-t.github.io/tarantool_examples
   ```
 
-2. install tarantool operator
+1. install CRUD storage
 
   ```shell
-  $ helm install --set namespace=tarantool tarantool-operator tarantool/tarantool-operator --namespace tarantool --create-namespace --version 0.0.6
-  ```
-
-3. install CRUD storage
-
-  ```shell
-  $ helm install tarantool-crud tarantool-examples/crud-storage --namespace=tarantool
+  $ helm install --set tarantool-operator.namespace=tarantool  crud tarantool-examples/crud-storage --namespace=tarantool --create-namespace --version 0.0.2
   ```
diff --git a/crud-storage/helm-chart/Chart.yaml b/crud-storage/helm-chart/Chart.yaml
@@ -2,4 +2,8 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Tarantool CRUD
 name: crud-storage
-version: 0.0.1
+version: 0.0.2
+dependencies:
+- name: tarantool-operator
+  version: "0.0.6"
+  repository: "https://tarantool.github.io/tarantool-operator"
diff --git a/crud-storage/helm-chart/requirements.lock b/crud-storage/helm-chart/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: tarantool-operator
+  repository: https://tarantool.github.io/tarantool-operator
+  version: 0.0.6
+digest: sha256:45d3af4c8220f98ef7f90c3ef20f9970262a163924ca7763d27fd5d517606f4f
+generated: "2020-10-06T11:32:09.021084+03:00"
diff --git a/crud-storage/helm-chart/templates/deployment.yaml b/crud-storage/helm-chart/templates/deployment.yaml
@@ -2,7 +2,6 @@ apiVersion: tarantool.io/v1alpha1
 kind: Cluster
 metadata:
   name: {{ .Values.ClusterName }}
-  namespace: {{ .Values.namespace }}
 spec:
   selector:
     matchLabels:
@@ -14,7 +13,6 @@ apiVersion: tarantool.io/v1alpha1
 kind: Role
 metadata:
   name: {{ .RoleName | replace "_" "" }}
-  namespace: {{ $.Values.namespace }}
   labels:
     tarantool.io/cluster-id: {{ $.Values.ClusterName }}
     tarantool.io/role: {{ .RoleName }}
@@ -30,7 +28,6 @@ apiVersion: tarantool.io/v1alpha1
 kind: ReplicasetTemplate
 metadata:
   name: "{{ .RoleName | replace "_" "" }}-template"
-  namespace: {{ $.Values.namespace }}
   labels:
     tarantool.io/cluster-id: {{ $.Values.ClusterName }}
     tarantool.io/replicaset-template: "{{ .RoleName }}-template"
@@ -115,7 +112,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
             - name: TARANTOOL_ADVERTISE_HOST
-              value: "$(TARANTOOL_ADVERTISE_TMP).{{ $.Values.ClusterName }}.{{ $.Values.namespace }}.svc.cluster.local"
+              value: "$(TARANTOOL_ADVERTISE_TMP).{{ $.Values.ClusterName }}.{{ $.Release.Namespace }}.svc.cluster.local"
             - name: TARANTOOL_ADVERTISE_URI
               value: "$(TARANTOOL_ADVERTISE_HOST):3301"
             - name: TARANTOOL_PROBE_URI_TIMEOUT
@@ -132,7 +129,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .RoleName }}
-  namespace: {{ $.Values.namespace }}
   labels:
     tarantool.io/role: {{ .RoleName }}
 spec:

diff --git a/crud-storage/helm-chart/values.yaml b/crud-storage/helm-chart/values.yaml
@@ -3,8 +3,6 @@
 ClusterEnv: dev
 ClusterName: tarantool-crud
 
-namespace: tarantool
-
 image:
   repository: vasiliyt/tarantool-crud
   tag: 0.0.2