This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch sp-1157-upgrade-third-party-services in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 15d71e53e20dece9b32612b8283e37814f3fbfcc Author: Dominik Riemer <[email protected]> AuthorDate: Sun Jan 29 16:09:29 2023 +0100 Bump influx version to 2.6 in helm charts (#1157) --- .../external/influxdb/influxdb-deployment.yaml | 19 +++++++- .../external/influxdb/influxdb2-pvc.yaml} | 51 ++++++++++++---------- installer/k8s/values.yaml | 11 ++++- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml b/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml index dba68d128..ffb7da328 100644 --- a/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml +++ b/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml @@ -31,9 +31,12 @@ spec: - name: influxdb-pv persistentVolumeClaim: claimName: influxdb-pvc + - name: influxdb2-pv + persistentVolumeClaim: + claimName: influxdb2-pvc containers: - name: influxdb - image: fogsyio/influxdb:{{ .Values.external.influxdbVersion }} + image: influxdb:{{ .Values.external.influxdbVersion }} imagePullPolicy: {{ .Values.pullPolicy }} ports: - containerPort: 8083 @@ -46,6 +49,20 @@ spec: value: "false" - name: INFLUXDB_ADMIN_ENABLED value: "true" + - name: DOCKER_INFLUXDB_INIT_USERNAME + value: {{ .Values.influxdb.username }} + - name: DOCKER_INFLUXDB_INIT_PASSWORD + value: {{ .Values.influxdb.password }} + - name: DOCKER_INFLUXDB_INIT_ADMIN_TOKEN + value: {{ .Values.influxdb.adminToken }} + - name: DOCKER_INFLUXDB_INIT_ORG + value: {{ .Values.influxdb.initOrg }} + - name: DOCKER_INFLUXDB_INIT_BUCKET + value: {{ .Values.influxdb.initBucket }} + - name: DOCKER_INFLUXDB_INIT_MODE + value: {{ .Values.influxdb.initMode }} volumeMounts: - mountPath: "/var/lib/influxdb" name: influxdb-pv + - mountPath: "/var/lib/influxdb2" + name: influxdb2-pv diff --git a/installer/k8s/values.yaml b/installer/k8s/templates/external/influxdb/influxdb2-pvc.yaml similarity index 55% copy from installer/k8s/values.yaml copy to installer/k8s/templates/external/influxdb/influxdb2-pvc.yaml index 7cd36b994..2e71d79d6 100644 --- a/installer/k8s/values.yaml +++ b/installer/k8s/templates/external/influxdb/influxdb2-pvc.yaml @@ -13,27 +13,30 @@ # See the License for the specific language governing permissions and # limitations under the License. -# lite or full (default: lite) -deployment: lite -preferredBroker: "nats" -pullPolicy: "IfNotPresent" -persistentVolumeReclaimPolicy: "Delete" -persistentVolumeAccessModes: "ReadWriteOnce" - -streampipes: - version: "0.91.0-SNAPSHOT" - registry: "apachestreampipes" - -external: - consulVersion: 1.14.3 - couchdbVersion: 3.3.1 - flinkVersion: 1.13.5-scala_2.11 - kafkaVersion: 2.2.0 - zookeeperVersion: 3.4.13 - influxdbVersion: 1.7 - - -# NOTE: Local testing only! -# minikube start --mount-string ${HOME}/streampipes-k8s:/streampipes-k8s --mount --memory=4g --cpus=4 -# Specify minikube directory: -hostPath: "/streampipes-k8s" +apiVersion: v1 +kind: PersistentVolume +metadata: + name: influx2-pv +spec: + storageClassName: local-storage-influx2 + capacity: + storage: 250Mi + accessModes: + - {{ .Values.persistentVolumeAccessModes }} + persistentVolumeReclaimPolicy: {{ .Values.persistentVolumeReclaimPolicy }} + hostPath: + path: {{ .Values.hostPath }}/influxdb2 +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + app: influxdb + name: influxdb2-pvc +spec: + storageClassName: local-storage-influx2 + accessModes: + - {{ .Values.persistentVolumeAccessModes }} + resources: + requests: + storage: 250Mi diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml index 7cd36b994..204fab0b9 100644 --- a/installer/k8s/values.yaml +++ b/installer/k8s/values.yaml @@ -30,7 +30,16 @@ external: flinkVersion: 1.13.5-scala_2.11 kafkaVersion: 2.2.0 zookeeperVersion: 3.4.13 - influxdbVersion: 1.7 + influxdbVersion: 2.6 + +influxdb: + username: "admin" + password: "sp-admin" + adminToken: "sp-admin" + initOrg: "sp" + initBucket: "sp" + initMode: "upgrade" + # NOTE: Local testing only!
