You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/09/14 13:02:34 UTC
[incubator-streampipes-installer] branch dev updated: [hotfix] rm
iotdb, redis from k8s deployment, readOnly option on shared volume
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git
The following commit(s) were added to refs/heads/dev by this push:
new 2e39de5 [hotfix] rm iotdb, redis from k8s deployment, readOnly option on shared volume
2e39de5 is described below
commit 2e39de5225875673954c52b4ead9aff76f2a8bd7
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Mon Sep 14 14:56:30 2020 +0200
[hotfix] rm iotdb, redis from k8s deployment, readOnly option on shared volume
---
k8s/templates/core/backend/backend-deployment.yaml | 4 +-
.../extensions/pipeline-elements/files-pvc.yaml | 2 +-
k8s/templates/external/iotdb/iotdb-deployment.yaml | 44 -------------------
k8s/templates/external/iotdb/iotdb-pvc.yaml | 27 ------------
k8s/templates/external/iotdb/iotdb-service.yaml | 29 -------------
k8s/templates/external/redis/redis-deployment.yaml | 50 ----------------------
k8s/templates/external/redis/redis-pvc.yaml | 27 ------------
k8s/templates/external/redis/redis-service.yaml | 29 -------------
8 files changed, 4 insertions(+), 208 deletions(-)
diff --git a/k8s/templates/core/backend/backend-deployment.yaml b/k8s/templates/core/backend/backend-deployment.yaml
index 9d395f3..ba682b1 100644
--- a/k8s/templates/core/backend/backend-deployment.yaml
+++ b/k8s/templates/core/backend/backend-deployment.yaml
@@ -40,7 +40,8 @@ spec:
claimName: backend-pvc
- name: files-pv
persistentVolumeClaim:
- claimName: files-pvc
+ claimName: files-pvc
+ readOnly: true
containers:
- name: backend
image: {{ .Values.streampipes.registry }}/backend:{{ .Values.streampipes.version }}
@@ -52,3 +53,4 @@ spec:
name: backend-pv
- mountPath: "/spImages"
name: files-pv
+ readOnly: true
diff --git a/k8s/templates/extensions/pipeline-elements/files-pvc.yaml b/k8s/templates/extensions/pipeline-elements/files-pvc.yaml
index c2fd708..0c117f9 100644
--- a/k8s/templates/extensions/pipeline-elements/files-pvc.yaml
+++ b/k8s/templates/extensions/pipeline-elements/files-pvc.yaml
@@ -20,7 +20,7 @@ metadata:
name: files-pvc
spec:
accessModes:
- - ReadWriteMany
+ - ReadWriteOnce
resources:
requests:
storage: 256Mi
diff --git a/k8s/templates/external/iotdb/iotdb-deployment.yaml b/k8s/templates/external/iotdb/iotdb-deployment.yaml
deleted file mode 100644
index 8bd9156..0000000
--- a/k8s/templates/external/iotdb/iotdb-deployment.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: iotdb
-spec:
- selector:
- matchLabels:
- app: iotdb
- replicas: 1
- template:
- metadata:
- labels:
- app: iotdb
- spec:
- volumes:
- - name: iotdb-pv
- persistentVolumeClaim:
- claimName: iotdb-pvc
- containers:
- - name: iotdb
- image: xingtanzjr/iotdb:{{ .Values.external.iotdbVersion }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- ports:
- - containerPort: 6667
- volumeMounts:
- - mountPath: "/iotdb/data"
- name: iotdb-pv
-{{- end }}
diff --git a/k8s/templates/external/iotdb/iotdb-pvc.yaml b/k8s/templates/external/iotdb/iotdb-pvc.yaml
deleted file mode 100644
index b583a1e..0000000
--- a/k8s/templates/external/iotdb/iotdb-pvc.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: iotdb-pvc
-spec:
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: 5Gi
-{{- end}}
diff --git a/k8s/templates/external/iotdb/iotdb-service.yaml b/k8s/templates/external/iotdb/iotdb-service.yaml
deleted file mode 100644
index dd2faba..0000000
--- a/k8s/templates/external/iotdb/iotdb-service.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: v1
-kind: Service
-metadata:
- name: iotdb
-spec:
- selector:
- app: iotdb
- ports:
- - name: main
- protocol: TCP
- port: 6667
- targetPort: 6667
-{{- end}}
diff --git a/k8s/templates/external/redis/redis-deployment.yaml b/k8s/templates/external/redis/redis-deployment.yaml
deleted file mode 100644
index 1d5c00d..0000000
--- a/k8s/templates/external/redis/redis-deployment.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: redis
- labels:
- db: redis
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: redis
- template:
- metadata:
- labels:
- app: redis
- db: redis
- spec:
- volumes:
- - name: redis-pv
- persistentVolumeClaim:
- claimName: redis-pvc
- containers:
- - name: redis
- image: redis:{{ .Values.external.redisVersion }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- args: ["--appendonly", "yes", "--save", "900", "1", "--save", "30", "1"]
- tty: true
- stdin: true
- ports:
- - containerPort: 6379
- volumeMounts:
- - mountPath: /data
- name: redis-pv
-{{- end }}
diff --git a/k8s/templates/external/redis/redis-pvc.yaml b/k8s/templates/external/redis/redis-pvc.yaml
deleted file mode 100644
index bd09504..0000000
--- a/k8s/templates/external/redis/redis-pvc.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: redis-pvc
-spec:
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: 5Gi
-{{- end}}
diff --git a/k8s/templates/external/redis/redis-service.yaml b/k8s/templates/external/redis/redis-service.yaml
deleted file mode 100644
index 43ccc3d..0000000
--- a/k8s/templates/external/redis/redis-service.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: v1
-kind: Service
-metadata:
- name: redis
-spec:
- selector:
- db: redis
- ports:
- - name: main
- protocol: TCP
- port: 6379
- targetPort: 6379
-{{- end}}