Merge pull request #82 from may-cat/78-fix-releases

#78 autoupdate to helm's version, not to default "latest" in values.yaml
flant · Mar 27, 2018 · dffef8c · dffef8c
2 parents b9c65c4 + 20e35b0
commit dffef8c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.idea
 /log
 /tmp
 # dotenv

diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 language: generic
 
+if: tag IS present
+
 install:
   # Installing helm
   - wget -q https://storage.googleapis.com/kubernetes-helm/helm-v2.6.2-linux-amd64.tar.gz
@@ -20,7 +22,7 @@ script:
   - helm repo index charts/
   - git add charts/
   - git commit --message "Add new version ${TRAVIS_TAG}"
-  - git remote add origin-pages https://${GITHUB_TOKEN}@github.com/flant/loghouse.git
+  - git remote add origin-pages https://${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
   - git push --quiet --set-upstream origin-pages gh-pages
 after_success:
   - true
diff --git a/charts/loghouse/templates/clickhouse/clickhouse.yaml b/charts/loghouse/templates/clickhouse/clickhouse.yaml
@@ -28,7 +28,7 @@ spec:
           mountPath: /var/lib/clickhouse
       containers:
       - name: clickhouse
-        image: flant/loghouse-clickhouse:{{ default .Chart.Version .Values.version }}
+        image: flant/loghouse-clickhouse:{{ .Chart.Version }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         ports:
         - name: http

diff --git a/charts/loghouse/templates/fluentd/fluentd.yaml b/charts/loghouse/templates/fluentd/fluentd.yaml
@@ -19,7 +19,7 @@ spec:
       serviceAccountName: fluentd
       containers:
       - name: fluentd
-        image: flant/loghouse-fluentd:{{ default .Chart.Version .Values.version }}
+        image: flant/loghouse-fluentd:{{ .Chart.Version }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         env:
         - name: FLUENTD_ARGS

diff --git a/charts/loghouse/templates/loghouse/loghouse-cronjob.yaml b/charts/loghouse/templates/loghouse/loghouse-cronjob.yaml
@@ -19,7 +19,7 @@ spec:
             command: ['/bin/sh', '-c', 'while ! getent ahostsv4 clickhouse; do sleep 1; done']
           containers:
             - name: cron
-              image: flant/loghouse-dashboard:{{ default .Chart.Version .Values.version }}
+              image: flant/loghouse-dashboard:{{ .Chart.Version }}
               imagePullPolicy: {{ .Values.imagePullPolicy }}
               command: ['/bin/bash', '-l', '-c', 'rake create_logs_tables']
               env:

diff --git a/charts/loghouse/templates/loghouse/loghouse-init-db.yaml b/charts/loghouse/templates/loghouse/loghouse-init-db.yaml
@@ -19,7 +19,7 @@ spec:
         command: [ '/bin/sh', '-c', 'while ! getent ahostsv4 clickhouse; do sleep 1; done' ]
       containers:
       - name: init
-        image: flant/loghouse-fluentd:{{ default .Chart.Version .Values.version }}
+        image: flant/loghouse-fluentd:{{ .Chart.Version }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         command: ['/bin/bash', '-l', '-c', 'clickhouse-client --host=${CLICKHOUSE_URL} --port=9000 --user=${CLICKHOUSE_USERNAME} --password=${CLICKHOUSE_PASSWORD} --query="CREATE DATABASE ${CLICKHOUSE_DATABASE};"']
         env:

diff --git a/charts/loghouse/templates/loghouse/loghouse-init-tables.yaml b/charts/loghouse/templates/loghouse/loghouse-init-tables.yaml
@@ -19,7 +19,7 @@ spec:
         command: [ '/bin/sh', '-c', 'while ! getent ahostsv4 clickhouse; do sleep 1; done' ]
       containers:
       - name: init-tables
-        image: flant/loghouse-dashboard:{{ default .Chart.Version .Values.version }}
+        image: flant/loghouse-dashboard:{{ .Chart.Version }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         command: ['/bin/bash', '-l', '-c', 'rake create_logs_tables']
         env:

diff --git a/charts/loghouse/templates/loghouse/loghouse.yaml b/charts/loghouse/templates/loghouse/loghouse.yaml
@@ -33,7 +33,7 @@ spec:
           mountPath: /etc/nginx/nginx.conf
           subPath: nginx.conf
       - name: backend
-        image: flant/loghouse-dashboard:{{ default .Chart.Version .Values.version }}
+        image: flant/loghouse-dashboard:{{ .Chart.Version }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         command: ["bundle", "exec", "puma"]
         ports:

diff --git a/charts/loghouse/templates/tabix/tabix.yaml b/charts/loghouse/templates/tabix/tabix.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: tabix
-        image: flant/loghouse-tabix:{{ default .Chart.Version .Values.version }}
+        image: flant/loghouse-tabix:{{ .Chart.Version }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         ports:
         - name: http

diff --git a/charts/loghouse/values.yaml b/charts/loghouse/values.yaml
@@ -61,9 +61,6 @@ partition_period: 1
 # If you not want install fluentd on master
 install_master: false
 
-# For install specific version of Chart use version
-version: latest
-
 imagePullPolicy: Always
 
 clickhouse:
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    /.idea
     /log
     /tmp
     # dotenv
@@ Expand Down @@