Explorar el Código

Pongo user y password en secreto

Celestino Rey hace 6 meses
padre
commit
9febefe841
Se han modificado 4 ficheros con 23 adiciones y 22 borrados
  1. 0 3
      K8S/env-prod-configmap.yaml
  2. 9 0
      K8S/secreto.yaml
  3. 3 10
      K8S/virtmanager-deployment.yaml
  4. 11 9
      Makefile

+ 0 - 3
K8S/env-prod-configmap.yaml

@@ -1,9 +1,6 @@
 apiVersion: v1
 apiVersion: v1
 data:
 data:
   SSH_HOST: 192.168.1.116
   SSH_HOST: 192.168.1.116
-  SECRET_KEY: change_me
-  SSH_USER: creylopez
-  SSH_PASSWORD: Rey-1176
   SSH_PORT: "22"
   SSH_PORT: "22"
 kind: ConfigMap
 kind: ConfigMap
 metadata:
 metadata:

+ 9 - 0
K8S/secreto.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mi-secreto
+  namespace: <NS>
+type: Opaque
+data:
+  SSH_USER: Y3JleWxvcGV6
+  SSH_PASSWORD: UmV5LTExNzY=

+ 3 - 10
K8S/virtmanager-deployment.yaml

@@ -43,21 +43,14 @@ spec:
             configMapKeyRef:
             configMapKeyRef:
               key: SSH_HOST
               key: SSH_HOST
               name: env-prod
               name: env-prod
-        - name: SSH_USER
-          valueFrom:
-            configMapKeyRef:
-              key: SSH_USER
-              name: env-prod
-        - name: SSH_PASSWORD
-          valueFrom:
-            configMapKeyRef:
-              key: SSH_PASSWORD
-              name: env-prod
         - name: SSH_PORT
         - name: SSH_PORT
           valueFrom:
           valueFrom:
             configMapKeyRef:
             configMapKeyRef:
               key: SSH_PORT
               key: SSH_PORT
               name: env-prod
               name: env-prod
+        envFrom:
+          - secretRef:
+              name: mi-secreto
         ports:
         ports:
         - containerPort: 8000
         - containerPort: 8000
           protocol: TCP
           protocol: TCP

+ 11 - 9
Makefile

@@ -12,21 +12,23 @@ imagen:
 	docker push ${REGISTRY}/virtmanager:${IMG_VERSION}
 	docker push ${REGISTRY}/virtmanager:${IMG_VERSION}
 
 
 ns:
 ns:
-	-cat namespace.yaml | sed -e "s/<NS>/${NAMESPACE}/" |kubectl create -f -
+	-cat K8S/namespace.yaml | sed -e "s/<NS>/${NAMESPACE}/" |kubectl create -f -
 
 
 install:
 install:
-	-cat reg-secret.yaml| sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
-	-cat env-prod-configmap.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
+	-cat K8S/reg-secret.yaml| sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
+	-cat K8S/secreto.yaml| sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
+	-cat K8S/env-prod-configmap.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
 
 
-	-cat virtmanager-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | sed -e "s/<TAG>/${IMG_VERSION}/" | kubectl create -f -
-	-cat virtmanager-ingress.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
+	-cat K8S/virtmanager-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | sed -e "s/<TAG>/${IMG_VERSION}/" | kubectl create -f -
+	-cat K8S/virtmanager-ingress.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
 
 
 clean:
 clean:
-	-cat virtmanager-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | sed -e "s/<TAG>/${IMG_VERSION}/" | kubectl delete -f -
+	-cat K8S/virtmanager-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | sed -e "s/<TAG>/${IMG_VERSION}/" | kubectl delete -f -
 
 
-	-cat env-prod-configmap.yaml  | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
+	-cat K8S/env-prod-configmap.yaml  | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
 
 
-	-cat reg-secret.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
-	-cat virtmanager-ingress.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
+	-cat K8S/reg-secret.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
+	-cat K8S/secreto.yaml| sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
+	-cat K8S/virtmanager-ingress.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -