From 88c0aaea278efb4bbe646632b3f11866190eb3e5 Mon Sep 17 00:00:00 2001
From: RGanor <44501230+RGanor@users.noreply.github.com>
Date: Tue, 7 Jun 2022 16:22:38 +0300
Subject: [PATCH] Updated k8s (#1216)

---
 deploy/kubernetes/README.md      |   2 +-
 deploy/kubernetes/configmap.yml  |  20 +-----
 deploy/kubernetes/deployment.yml | 105 +++++--------------------------
 3 files changed, 20 insertions(+), 107 deletions(-)

diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md
index 7770d8a..9a0a547 100644
--- a/deploy/kubernetes/README.md
+++ b/deploy/kubernetes/README.md
@@ -1 +1 @@
-#Files to deploy pdns-admin on kubernetes
+#Files to deploy PowerDNS-Admin on kubernetes
diff --git a/deploy/kubernetes/configmap.yml b/deploy/kubernetes/configmap.yml
index c27e0b4..4270db2 100644
--- a/deploy/kubernetes/configmap.yml
+++ b/deploy/kubernetes/configmap.yml
@@ -1,22 +1,8 @@
-apiVersion: v1
 kind: ConfigMap
+apiVersion: v1
 metadata:
   name: powerdnsadmin-env
-  namespace: powerdnsadmin
 data:
-  FLASK_APP: "/powerdns-admin/app/__init__.py"
-  BIND_ADDRESS: changeme_0.0.0.0
-  LDAP_FILTER: changeme_(objectClass=user)
-  LDAP_PASSWORD: changeme_Password
-  LDAP_SEARCH_BASE: changeme_cn=Users,dc=domain,dc=com
-  LDAP_TYPE: changeme_ldap
-  LDAP_URI: changeme_ldaps://ad.domain.com:636
-  LDAP_USERNAME: changeme_cn=svcUser,ou=ScriptUsers,dc=domain,dc=com
-  LDAP_USERNAMEFIELD: changeme_sAMAccountName
-  PDNS_API_KEY: changeme_secret
-  PDNS_HOST: changeme_pdns_host
+  FLASK_APP: powerdnsadmin/__init__.py
   SECRET_KEY: changeme_secret
-  SQLA_DB_HOST: changeme_db_host
-  SQLA_DB_NAME: changeme_db_name
-  SQLA_DB_PASSWORD: changeme_db_password_
-  SQLA_DB_USER: changeme_db_user
+  SQLALCHEMY_DATABASE_URI: 'mysql://user:password@host/database'
diff --git a/deploy/kubernetes/deployment.yml b/deploy/kubernetes/deployment.yml
index 337f638..1e5fea5 100644
--- a/deploy/kubernetes/deployment.yml
+++ b/deploy/kubernetes/deployment.yml
@@ -1,102 +1,29 @@
-apiVersion: extensions/v1beta1
 kind: Deployment
+apiVersion: apps/v1
 metadata:
   name: powerdnsadmin
-  namespace: powerdnsadmin
   labels:
     app: powerdnsadmin
 spec:
+  strategy:
+    type: RollingUpdate
   replicas: 1
+  selector:
+    matchLabels:
+      app: powerdnsadmin
   template:
     metadata:
       labels:
         app: powerdnsadmin
     spec:
       containers:
-      - name: powerdnsadmin
-        image: changeme_artsn00p/powerdns-admin-docker
-        ports:
-        - containerPort: 80
-        env:
-        - name: BIND_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              key: BIND_ADDRESS
-              name: powerdnsadmin-env
-        - name: LDAP_FILTER
-          valueFrom:
-            configMapKeyRef:
-              key: LDAP_FILTER
-              name: powerdnsadmin-env
-        - name: LDAP_PASSWORD
-          valueFrom:
-            configMapKeyRef:
-              key: LDAP_PASSWORD
-              name: powerdnsadmin-env
-        - name: LDAP_SEARCH_BASE
-          valueFrom:
-            configMapKeyRef:
-              key: LDAP_SEARCH_BASE
-              name: powerdnsadmin-env
-        - name: LDAP_TYPE
-          valueFrom:
-            configMapKeyRef:
-              key: LDAP_TYPE
-              name: powerdnsadmin-env
-        - name: LDAP_URI
-          valueFrom:
-            configMapKeyRef:
-              key: LDAP_URI
-              name: powerdnsadmin-env
-        - name: LDAP_USERNAME
-          valueFrom:
-            configMapKeyRef:
-              key: LDAP_USERNAME
-              name: powerdnsadmin-env
-        - name: LDAP_USERNAMEFIELD
-          valueFrom:
-            configMapKeyRef:
-              key: LDAP_USERNAMEFIELD
-              name: powerdnsadmin-env
-        - name: PDNS_API_KEY
-          valueFrom:
-            configMapKeyRef:
-              key: PDNS_API_KEY
-              name: powerdnsadmin-env
-        - name: PDNS_HOST
-          valueFrom:
-            configMapKeyRef:
-              key: PDNS_HOST
-              name: powerdnsadmin-env
-        - name: SECRET_KEY
-          valueFrom:
-            configMapKeyRef:
-              key: SECRET_KEY
-              name: powerdnsadmin-env
-        - name: PDA_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              key: SQLA_DB_HOST
-              name: powerdnsadmin-env
-        - name: PDA_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              key: SQLA_DB_NAME
-              name: powerdnsadmin-env
-        - name: PDA_DB_PASSWORD
-          valueFrom:
-            configMapKeyRef:
-              key: SQLA_DB_PASSWORD
-              name: powerdnsadmin-env
-        - name: PDA_DB_USER
-          valueFrom:
-            configMapKeyRef:
-              key: SQLA_DB_USER
-              name: powerdnsadmin-env
-        - name: FLASK_APP
-          valueFrom:
-            configMapKeyRef:
-              key: FLASK_APP
-              name: powerdnsadmin-env
-      restartPolicy: Always
-
+        - name: powerdnsadmin
+          image: ngoduykhanh/powerdns-admin
+          ports:
+            - containerPort: 80
+              protocol: TCP
+          envFrom:
+            - configMapRef:
+                name: powerdnsadmin-env
+          imagePullPolicy: Always
+      restartPolicy: Always
\ No newline at end of file