You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/07/01 10:27:33 UTC
[incubator-streampipes] branch dev updated: [hotfix] Replace connect adapters and pipeline-elements with extensions-all-jvm
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 62b79224a [hotfix] Replace connect adapters and pipeline-elements with extensions-all-jvm
62b79224a is described below
commit 62b79224aaa0878122ab839cddb3b6d3e7e03647
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Fri Jul 1 12:27:23 2022 +0200
[hotfix] Replace connect adapters and pipeline-elements with extensions-all-jvm
---
.../connect-adapters-deployment.yaml | 35 ----------------------
.../connect-adapters-iiot-deployment.yaml | 35 ----------------------
.../connect-adapters/connect-adapters-service.yaml | 27 -----------------
...ent.yaml => extensions-all-jvm-deployment.yaml} | 14 ++++-----
.../extensions-all-jvm-service.yaml} | 8 +++--
.../pipeline-elements-all-jvm-service.yaml | 29 ------------------
6 files changed, 12 insertions(+), 136 deletions(-)
diff --git a/installer/k8s/templates/extensions/connect-adapters/connect-adapters-deployment.yaml b/installer/k8s/templates/extensions/connect-adapters/connect-adapters-deployment.yaml
deleted file mode 100644
index 1dc55262a..000000000
--- a/installer/k8s/templates/extensions/connect-adapters/connect-adapters-deployment.yaml
+++ /dev/null
@@ -1,35 +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.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: connect-adapters
-spec:
- selector:
- matchLabels:
- app: connect-adapters
- replicas: 1
- template:
- metadata:
- labels:
- app: connect-adapters
- spec:
- containers:
- - name: connect-adapters
- image: {{ .Values.streampipes.registry }}/connect-adapters:{{ .Values.streampipes.version }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- ports:
- - containerPort: 8090
diff --git a/installer/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-deployment.yaml b/installer/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-deployment.yaml
deleted file mode 100644
index a67ff5ed5..000000000
--- a/installer/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-deployment.yaml
+++ /dev/null
@@ -1,35 +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.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: connect-adapters-iiot
-spec:
- selector:
- matchLabels:
- app: connect-adapters-iiot
- replicas: 1
- template:
- metadata:
- labels:
- app: connect-adapters-iiot
- spec:
- containers:
- - name: connect-adapters-iiot
- image: {{ .Values.streampipes.registry }}/connect-adapters-iiot:{{ .Values.streampipes.version }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- ports:
- - containerPort: 8090
diff --git a/installer/k8s/templates/extensions/connect-adapters/connect-adapters-service.yaml b/installer/k8s/templates/extensions/connect-adapters/connect-adapters-service.yaml
deleted file mode 100644
index 213aef38f..000000000
--- a/installer/k8s/templates/extensions/connect-adapters/connect-adapters-service.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.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: connect-adapters
-spec:
- selector:
- app: connect-adapters
- ports:
- - name: main
- protocol: TCP
- port: 8090
- targetPort: 8001
diff --git a/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-jvm-deployment.yaml b/installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-deployment.yaml
similarity index 77%
rename from installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-jvm-deployment.yaml
rename to installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-deployment.yaml
index 6508e3737..fb1cf7fe8 100644
--- a/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-jvm-deployment.yaml
+++ b/installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-deployment.yaml
@@ -16,27 +16,27 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: pipeline-elements-all-jvm
+ name: extensions-all-jvm
spec:
selector:
matchLabels:
- app: pipeline-elements-all-jvm
+ app: extensions-all-jvm
replicas: 1
template:
metadata:
labels:
- app: pipeline-elements-all-jvm
+ app: extensions-all-jvm
spec:
volumes:
- name: files-pv
persistentVolumeClaim:
- claimName: files-pvc
+ claimName: files-pvc
containers:
- - name: pipeline-elements-all-jvm
- image: {{ .Values.streampipes.registry }}/pipeline-elements-all-jvm:{{ .Values.streampipes.version }}
+ - name: extensions-all-jvm
+ image: {{ .Values.streampipes.registry }}/extensions-all-jvm:{{ .Values.streampipes.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
- containerPort: 8090
volumeMounts:
- mountPath: "/spImages"
- name: files-pv
+ name: files-pv
diff --git a/installer/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-service.yaml b/installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-service.yaml
similarity index 88%
rename from installer/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-service.yaml
rename to installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-service.yaml
index d4ec5596a..8a3a36ad0 100644
--- a/installer/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-service.yaml
+++ b/installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-service.yaml
@@ -16,12 +16,14 @@
apiVersion: v1
kind: Service
metadata:
- name: connect-adapters-iiot
+ name: extensions-all-jvm
+ labels:
+ name: extensions-all-jvm
spec:
selector:
- app: connect-adapters-iiot
+ app: extensions-all-jvm
ports:
- name: main
protocol: TCP
port: 8090
- targetPort: 8002
+ targetPort: 8090
diff --git a/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-jvm-service.yaml b/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-jvm-service.yaml
deleted file mode 100644
index 1b1b01ce4..000000000
--- a/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-jvm-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.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: pipeline-elements-all-jvm
- labels:
- name: pipeline-elements-all-jvm
-spec:
- selector:
- app: pipeline-elements-all-jvm
- ports:
- - name: main
- protocol: TCP
- port: 8090
- targetPort: 8090
\ No newline at end of file