Fixes wrt. deployment YAML. 82/3482/1
authoragrawalgaurav <gaurav.agrawal@huawei.com>
Mon, 18 May 2020 17:59:05 +0000 (23:29 +0530)
committeragrawalgaurav <gaurav.agrawal@huawei.com>
Mon, 18 May 2020 17:59:05 +0000 (23:29 +0530)
Change-Id: Icf0aeab7d0d9dfbd997630eef8cdd44d9bf406ae

mecm/mepm/applcm/resources/deployment/applcm-broker-deployment.yaml [new file with mode: 0644]
mecm/mepm/applcm/resources/deployment/applcm-broker-service.yaml [new file with mode: 0644]
mecm/mepm/applcm/resources/deployment/applcm-broker.yaml [deleted file]
mecm/mepm/applcm/resources/deployment/db-deployment.yaml [new file with mode: 0644]
mecm/mepm/applcm/resources/deployment/db-service.yaml [new file with mode: 0644]
mecm/mepm/applcm/resources/deployment/dbhost.yaml [deleted file]
mecm/mepm/applcm/resources/deployment/helm-plugin-deployment.yaml [new file with mode: 0644]
mecm/mepm/applcm/resources/deployment/helm-plugin-service.yaml [new file with mode: 0644]
mecm/mepm/applcm/resources/deployment/helm-plugin.yaml [deleted file]
mecm/mepm/applcm/resources/deployment/my-db-persistentvolumeclaim.yaml [moved from mecm/mepm/applcm/resources/deployment/my-db-pvc.yaml with 88% similarity]

diff --git a/mecm/mepm/applcm/resources/deployment/applcm-broker-deployment.yaml b/mecm/mepm/applcm/resources/deployment/applcm-broker-deployment.yaml
new file mode 100644 (file)
index 0000000..ce4d6b4
--- /dev/null
@@ -0,0 +1,76 @@
+# Copyright 2020 Huawei Technologies Co., Ltd.
+#
+# Licensed 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.
+
+# yamllint disable
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: applcm-broker
+  name: applcm-broker
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: applcm-broker
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: applcm-broker
+    spec:
+      containers:
+      - env:
+        - name: ADDRESS
+          value: 0.0.0.0:8081
+        - name: HELM_PLUGIN_PORT
+          value: "50051"
+        - name: KUBERNETES_PLUGIN_PORT
+          value: "50052"
+        - name: LOGFILE_PATH
+          value: /go/release/logfile
+        - name: LOGGER_LEVEL
+          value: info
+        - name: MYSQL_DATABASE
+          value: db
+        - name: MYSQL_PASSWORD
+          value: password
+        - name: MYSQL_ROOT_PASSWORD
+          value: password
+        - name: MYSQL_USER
+          value: root
+        - name: PACKAGE_ARTIFACT_PATH
+          value: /Artifacts/Deployment/
+        - name: PACKAGE_PATH
+          value: /go/release/application/packages/
+        image: ealtedge/applcm-broker:latest
+        imagePullPolicy: ""
+        name: applcm-broker
+        ports:
+        - containerPort: 8081
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
+
+# yamllint enable
diff --git a/mecm/mepm/applcm/resources/deployment/applcm-broker-service.yaml b/mecm/mepm/applcm/resources/deployment/applcm-broker-service.yaml
new file mode 100644 (file)
index 0000000..737611b
--- /dev/null
@@ -0,0 +1,38 @@
+# Copyright 2020 Huawei Technologies Co., Ltd.
+#
+# Licensed 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.
+
+# yamllint disable
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: applcm-broker
+  name: applcm-broker
+spec:
+  type: NodePort
+  ports:
+  - name: "28081"
+    port: 8081
+    targetPort: 8081
+    nodePort: 30001
+  selector:
+    io.kompose.service: applcm-broker
+status:
+  loadBalancer: {}
+
+# yamllint enable
diff --git a/mecm/mepm/applcm/resources/deployment/applcm-broker.yaml b/mecm/mepm/applcm/resources/deployment/applcm-broker.yaml
deleted file mode 100644 (file)
index 96b9801..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2020 Huawei Technologies Co., Ltd.
-#
-# Licensed 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 the50051 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.
-# applcm pod
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.name: applcm-broker
-  name: applcm-broker
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.name: applcm-broker
-  template:
-    metadata:
-      labels:
-        app.name: applcm-broker
-    spec:
-      containers:
-        - image: ealtedge/applcm-broker:latest
-          imagePullPolicy: IfNotPresent
-          name: applcm-broker
-          ports:
-            - containerPort: 8081
-          env:
-            - name: ADDRESS
-              value: 0.0.0.0:8081
-            - name: HELM_PLUGIN_PORT
-              value: "50051"
-            - name: KUBERNETES_PLUGIN_PORT
-              value: "50052"
-            - name: LOGFILE_PATH
-              value: /go/release/logfile
-            - name: LOGGER_LEVEL
-              value: info
-            - name: MYSQL_DATABASE
-              value: db
-            - name: MYSQL_PASSWORD
-              value: password
-            - name: MYSQL_ROOT_PASSWORD
-              value: password
-            - name: MYSQL_USER
-              value: root
-            - name: PACKAGE_ARTIFACT_PATH
-              value: /Artifacts/Deployment/
-            - name: PACKAGE_PATH
-              value: /go/release/application/packages/
-# applcm service
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.service: applcm-broker
-  name: applcm-broker
-spec:
-  type: NodePort
-  selector:
-    app: applcm-broker
-  ports:
-    - port: 8081
-      targetPort: 8081
-      nodePort: 30001
diff --git a/mecm/mepm/applcm/resources/deployment/db-deployment.yaml b/mecm/mepm/applcm/resources/deployment/db-deployment.yaml
new file mode 100644 (file)
index 0000000..b65dcd7
--- /dev/null
@@ -0,0 +1,69 @@
+# Copyright 2020 Huawei Technologies Co., Ltd.
+#
+# Licensed 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.
+
+# yamllint disable
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: db
+  name: db
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: db
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: db
+    spec:
+      containers:
+      - env:
+        - name: MYSQL_DATABASE
+          value: db
+        - name: MYSQL_PASSWORD
+          value: password
+        - name: MYSQL_ROOT_PASSWORD
+          value: password
+        - name: MYSQL_USER
+          value: root
+        image: mysql/mysql-server
+        imagePullPolicy: ""
+        name: db
+        ports:
+        - containerPort: 3306
+        resources: {}
+        volumeMounts:
+        - mountPath: /var/lib/mysql
+          name: my-db
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes:
+      - name: my-db
+        hostPath:
+          path: /data
+status: {}
+
+# yamllint enable
diff --git a/mecm/mepm/applcm/resources/deployment/db-service.yaml b/mecm/mepm/applcm/resources/deployment/db-service.yaml
new file mode 100644 (file)
index 0000000..ee1adb2
--- /dev/null
@@ -0,0 +1,36 @@
+# Copyright 2020 Huawei Technologies Co., Ltd.
+#
+# Licensed 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.
+
+# yamllint disable
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: db
+  name: dbhost
+spec:
+  ports:
+  - name: "3306"
+    port: 3306
+    targetPort: 3306
+  selector:
+    io.kompose.service: db
+status:
+  loadBalancer: {}
+
+# yamllint enable
diff --git a/mecm/mepm/applcm/resources/deployment/dbhost.yaml b/mecm/mepm/applcm/resources/deployment/dbhost.yaml
deleted file mode 100644 (file)
index 52df5d1..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020 Huawei Technologies Co., Ltd.
-#
-# Licensed 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.
-# dbhost pod
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    dbhost.app: dbhost
-  name: dbhost
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      dbhost.app: dbhost
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        dbhost.app: dbhost
-    spec:
-      containers:
-        - image: mysql:5.7
-          imagePullPolicy: IfNotPresent
-          name: dbhost
-          ports:
-            - containerPort: 3306
-          env:
-            - name: MYSQL_DATABASE
-              value: dbhost
-            - name: MYSQL_PASSWORD
-              value: password
-            - name: MYSQL_ROOT_PASSWORD
-              value: password
-            - name: MYSQL_USER
-              value: root
-          volumeMounts:
-            - mountPath: /var/lib/mysql
-              name: my-db
-      volumes:
-        - name: my-db
-          hostPath:
-            # data folder needs to be created in host machine
-            path: /data
-
-# dbhost service
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    dbhost.service: dbhost
-  name: dbhost
-spec:
diff --git a/mecm/mepm/applcm/resources/deployment/helm-plugin-deployment.yaml b/mecm/mepm/applcm/resources/deployment/helm-plugin-deployment.yaml
new file mode 100644 (file)
index 0000000..c7fac0d
--- /dev/null
@@ -0,0 +1,68 @@
+# Copyright 2020 Huawei Technologies Co., Ltd.
+#
+# Licensed 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.
+
+# yamllint disable
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: helm-plugin
+  name: helm-plugin
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: helm-plugin
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: helm-plugin
+    spec:
+      containers:
+      - env:
+        - name: CERTIFICATE_PATH
+        - name: CHART_PATH
+          value: /go/release/charts/
+        - name: HELM_PLUGIN_PORT
+          value: "50051"
+        - name: KEY_PATH
+        - name: KUBECONFIG_DIR_PATH
+          value: /go/release/kubeconfig/
+        - name: LOGFILE_PATH
+          value: /go/release/logfile
+        - name: LOGGER_LEVEL
+          value: info
+        - name: RELEASE_NAMESPACE
+          value: default
+        image: ealtedge/helmplugin:latest
+        imagePullPolicy: ""
+        name: helmplugin
+        ports:
+        - containerPort: 50051
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
+
+# yamllint enable
diff --git a/mecm/mepm/applcm/resources/deployment/helm-plugin-service.yaml b/mecm/mepm/applcm/resources/deployment/helm-plugin-service.yaml
new file mode 100644 (file)
index 0000000..cd9543e
--- /dev/null
@@ -0,0 +1,36 @@
+# Copyright 2020 Huawei Technologies Co., Ltd.
+#
+# Licensed 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.
+
+# yamllint disable
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: helm-plugin
+  name: helmplugin
+spec:
+  ports:
+  - name: "50051"
+    port: 50051
+    targetPort: 50051
+  selector:
+    io.kompose.service: helm-plugin
+status:
+  loadBalancer: {}
+
+# yamllint enable
diff --git a/mecm/mepm/applcm/resources/deployment/helm-plugin.yaml b/mecm/mepm/applcm/resources/deployment/helm-plugin.yaml
deleted file mode 100644 (file)
index b58b6f2..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2020 Huawei Technologies Co., Ltd.
-#
-# Licensed 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.
-# helmplugin pod
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.name: helmplugin
-  name: helmplugin
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.name: helmplugin
-  template:
-    metadata:
-      labels:
-        app.name: helmplugin
-    spec:
-      containers:
-        - image: ealtedge/helmplugin:latest
-          imagePullPolicy: IfNotPresent
-          name: helmplugin
-          ports:
-            - containerPort: 50051
-          env:
-            - name: CERTIFICATE_PATH
-            - name: CHART_PATH
-              value: /go/release/charts/
-            - name: HELM_PLUGIN_PORT
-              value: "50051"
-            - name: KEY_PATH
-            - name: KUBECONFIG_DIR_PATH
-              value: /go/release/kubeconfig/
-            - name: LOGFILE_PATH
-              value: /go/release/logfile
-            - name: LOGGER_LEVEL
-              value: info
-            - name: RELEASE_NAMESPACE
-              value: default
-# helmplugin service
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.service: helmplugin
-  name: helmplugin
-spec:
-  ports:
-    - name: "50051"
-      port: 50051
-      targetPort: 50051
-  selector:
-    app.name: helmplugin
-status:
-  loadBalancer: {}
 # 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.
-# pvc
----
+
+# yamllint disable
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   creationTimestamp: null
   labels:
-    pvc.service: my-db
+    io.kompose.service: my-db
   name: my-db
 spec:
   accessModes:
-    - ReadWriteOnce
+  - ReadWriteOnce
   resources:
     requests:
       storage: 100Mi
+status: {}
+
+# yamllint enable