From 5ba77cfe5ce1b4b06c31c821a23e861fdee3e917 Mon Sep 17 00:00:00 2001 From: Lex Rivera Date: Fri, 26 Jun 2020 11:10:44 +0300 Subject: [PATCH] [freetakserver] update --- charts/freetakserver/Chart.yaml | 4 ++-- .../freetakserver/templates/deployment.yaml | 19 ------------------- charts/freetakserver/templates/svc.yaml | 4 ++++ charts/freetakserver/values.yaml | 3 ++- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/charts/freetakserver/Chart.yaml b/charts/freetakserver/Chart.yaml index d3a1bde51..b34188e43 100644 --- a/charts/freetakserver/Chart.yaml +++ b/charts/freetakserver/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: freetakserver -version: 1.0.4 -appVersion: 0.8.19 +version: 1.0.5 +appVersion: 0.8.23 home: https://github.com/Tapawingo/FreeTakServer description: FTS is a Python3 implementation of the TAK Server keywords: diff --git a/charts/freetakserver/templates/deployment.yaml b/charts/freetakserver/templates/deployment.yaml index 6ac80e76f..27f3593a2 100644 --- a/charts/freetakserver/templates/deployment.yaml +++ b/charts/freetakserver/templates/deployment.yaml @@ -96,22 +96,3 @@ spec: tolerations: {{ toYaml .Values.tolerations | indent 8 }} {{- end }} - initContainers: - - name: create-datapackage-dir - image: busybox - command: - - mkdir - - "-p" - - "/data/fts_datapackages" - volumeMounts: - - name: datadir - mountPath: "/data" - - name: create-log-dir - image: busybox - command: - - mkdir - - "-p" - - "/data/logs" - volumeMounts: - - name: datadir - mountPath: "/data" diff --git a/charts/freetakserver/templates/svc.yaml b/charts/freetakserver/templates/svc.yaml index 99c1fdcfe..5e7b007fe 100644 --- a/charts/freetakserver/templates/svc.yaml +++ b/charts/freetakserver/templates/svc.yaml @@ -7,6 +7,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" + annotations: + {{- range $key, $value := .Values.freetakserver.service.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} spec: {{- if (or (eq .Values.freetakserver.serviceType "ClusterIP") (empty .Values.freetakserver.serviceType)) }} type: ClusterIP diff --git a/charts/freetakserver/values.yaml b/charts/freetakserver/values.yaml index 1f658b245..9723c96c5 100644 --- a/charts/freetakserver/values.yaml +++ b/charts/freetakserver/values.yaml @@ -45,7 +45,8 @@ freetakserver: # loadBalancerSourceRanges: [] ## Set the externalTrafficPolicy in the Service to either Cluster or Local # externalTrafficPolicy: Cluster - + service: + annotations: {} ## Additional freetakserver container environment variables ## extraEnv: {}