postgres yaml files modified

port reverted back to target port

Signed-off-by: Srinivasan Selvam <srinivasan.s.n@huawei.com>
Change-Id: I9aa6df511232eca08c319333873f0297f4a55fa4

diff --git a/mecm/mepm/applcm/resources/deployment/postgres-config.yaml b/mecm/mepm/applcm/resources/deployment/postgres-config.yaml
new file mode 100644 (file)
index 0000000..7cc87a3
--- /dev/null
+++ b/mecm/mepm/applcm/resources/deployment/postgres-config.yaml
@@ -0,0 +1,26 @@
+# 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.
+
+# configmap
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postgres-config
+  labels:
+    app: postgres
+data:
+  POSTGRES_DB: mecmdb
+  POSTGRES_USER: root
+  POSTGRES_PASSWORD: password

diff --git a/mecm/mepm/applcm/resources/deployment/postgres-k8s.yaml b/mecm/mepm/applcm/resources/deployment/postgres-k8s.yaml
index 82e2921..3846778 100644 (file)
--- a/mecm/mepm/applcm/resources/deployment/postgres-k8s.yaml
+++ b/mecm/mepm/applcm/resources/deployment/postgres-k8s.yaml
@@ -32,38 +32,19 @@ spec:
       labels:
         app: postgres-db
     spec:
-      volumes:
-        - name: postgres-data
-          persistentVolumeClaim:
-            claimName: postgres-pv-claim
       containers:
-        - name: postgres-db
-          image: postgres:9.6
-          imagePullPolicy: "IfNotPresent"
-          env:
-            - name: POSTGRES_DB
-              value: mecmdb
-            - name: POSTGRES_USER
-              value: root
-            - name: POSTGRES_PASSWORD
-              value: password
+        - name: postgres
+          image: postgres:13
+          imagePullPolicy: "Always"
+          envFrom:
+            - configMapRef:
+                name: postgres-config
           volumeMounts:
             - mountPath: /var/lib/postgresql/data
-              name: postgres-data
+              name: postgredb
           ports:
             - containerPort: 5432
-
-# postgres service
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mecmdb
-  namespace: default
-spec:
-  selector:
-    app: postgres-db
-  ports:
-    - name: "5432"
-      port: 5432
-      targetPort: 5432
+      volumes:
+        - name: postgredb
+          persistentVolumeClaim:
+            claimName: postgres-pv-claim

diff --git a/mecm/mepm/applcm/resources/deployment/postgres-service.yaml b/mecm/mepm/applcm/resources/deployment/postgres-service.yaml
new file mode 100644 (file)
index 0000000..59e6147
--- /dev/null
+++ b/mecm/mepm/applcm/resources/deployment/postgres-service.yaml
@@ -0,0 +1,30 @@
+# 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.
+
+# postgres-service
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mecmdb
+  namespace: default
+  labels:
+    app: postgres
+spec:
+  selector:
+    app: postgres-db
+  ports:
+    - name: "5432"
+      port: 5432
+      targetPort: 5432

diff --git a/mecm/mepm/applcm/resources/deployment/postgres-db-pvc.yaml b/mecm/mepm/applcm/resources/deployment/postgres-storage.yaml
similarity index 95%
rename from mecm/mepm/applcm/resources/deployment/postgres-db-pvc.yaml
rename to mecm/mepm/applcm/resources/deployment/postgres-storage.yaml
index 85aac62..9119282 100644 (file)
--- a/mecm/mepm/applcm/resources/deployment/postgres-db-pvc.yaml
+++ b/mecm/mepm/applcm/resources/deployment/postgres-storage.yaml
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 # persistent volume
 ---
 kind: PersistentVolume
@@ -29,15 +28,12 @@ spec:
   accessModes:
     - ReadWriteMany
   hostPath:
-    path: "/data"
-
-# pvc
+    path: "/mnt/data"
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: postgres-pv-claim
-  namespace: default
   labels:
     app: postgres
 spec:

diff --git a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-config.yaml b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-config.yaml
new file mode 100644 (file)
index 0000000..7cc87a3
--- /dev/null
+++ b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-config.yaml
@@ -0,0 +1,26 @@
+# 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.
+
+# configmap
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postgres-config
+  labels:
+    app: postgres
+data:
+  POSTGRES_DB: mecmdb
+  POSTGRES_USER: root
+  POSTGRES_PASSWORD: password

diff --git a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml
index 82e2921..3846778 100644 (file)
--- a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml
+++ b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml
@@ -32,38 +32,19 @@ spec:
       labels:
         app: postgres-db
     spec:
-      volumes:
-        - name: postgres-data
-          persistentVolumeClaim:
-            claimName: postgres-pv-claim
       containers:
-        - name: postgres-db
-          image: postgres:9.6
-          imagePullPolicy: "IfNotPresent"
-          env:
-            - name: POSTGRES_DB
-              value: mecmdb
-            - name: POSTGRES_USER
-              value: root
-            - name: POSTGRES_PASSWORD
-              value: password
+        - name: postgres
+          image: postgres:13
+          imagePullPolicy: "Always"
+          envFrom:
+            - configMapRef:
+                name: postgres-config
           volumeMounts:
             - mountPath: /var/lib/postgresql/data
-              name: postgres-data
+              name: postgredb
           ports:
             - containerPort: 5432
-
-# postgres service
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mecmdb
-  namespace: default
-spec:
-  selector:
-    app: postgres-db
-  ports:
-    - name: "5432"
-      port: 5432
-      targetPort: 5432
+      volumes:
+        - name: postgredb
+          persistentVolumeClaim:
+            claimName: postgres-pv-claim

diff --git a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-service.yaml b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-service.yaml
new file mode 100644 (file)
index 0000000..59e6147
--- /dev/null
+++ b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-service.yaml
@@ -0,0 +1,30 @@
+# 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.
+
+# postgres-service
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mecmdb
+  namespace: default
+  labels:
+    app: postgres
+spec:
+  selector:
+    app: postgres-db
+  ports:
+    - name: "5432"
+      port: 5432
+      targetPort: 5432

diff --git a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-db-pvc.yaml b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-storage.yaml
similarity index 95%
rename from ocd/infra/playbooks/roles/applcm/files/deploy/postgres-db-pvc.yaml
rename to ocd/infra/playbooks/roles/applcm/files/deploy/postgres-storage.yaml
index 85aac62..9119282 100644 (file)
--- a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-db-pvc.yaml
+++ b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-storage.yaml
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 # persistent volume
 ---
 kind: PersistentVolume
@@ -29,15 +28,12 @@ spec:
   accessModes:
     - ReadWriteMany
   hostPath:
-    path: "/data"
-
-# pvc
+    path: "/mnt/data"
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: postgres-pv-claim
-  namespace: default
   labels:
     app: postgres
 spec: