From 7e4c3a43c0f25b24f83ce6c6349ee72047a1d0a9 Mon Sep 17 00:00:00 2001
From: Leon Klingele <git@leonklingele.de>
Date: Thu, 16 Jan 2020 11:53:04 +0100
Subject: [PATCH] k8s: clean up
---
kubernetes/auth/README.md | 1 -
.../auth/templates/auth-deployment.yaml | 20 ++++---------------
.../auth/templates/auth-env-configmap.yaml | 11 +++++-----
kubernetes/auth/templates/auth-service.yaml | 12 +++--------
4 files changed, 12 insertions(+), 32 deletions(-)
delete mode 100644 kubernetes/auth/README.md
diff --git a/kubernetes/auth/README.md b/kubernetes/auth/README.md
deleted file mode 100644
index d3885b6..0000000
--- a/kubernetes/auth/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This chart was created by Kompose
diff --git a/kubernetes/auth/templates/auth-deployment.yaml b/kubernetes/auth/templates/auth-deployment.yaml
index 841fca5..a5c9906 100644
--- a/kubernetes/auth/templates/auth-deployment.yaml
+++ b/kubernetes/auth/templates/auth-deployment.yaml
@@ -1,28 +1,18 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- annotations:
- kompose.cmd: kompose convert --chart --controller=deployment --replicas=3 --controller=deployment
- kompose.version: 1.20.0 ()
- creationTimestamp: null
- labels:
- io.kompose.service: auth
name: auth
+ labels:
+ app: auth
spec:
replicas: 3
selector:
matchLabels:
- io.kompose.service: auth
- strategy: {}
+ app: auth
template:
metadata:
- annotations:
- kompose.cmd: kompose convert --chart --controller=deployment --replicas=3
- --controller=deployment
- kompose.version: 1.20.0 ()
- creationTimestamp: null
labels:
- io.kompose.service: auth
+ app: auth
spec:
containers:
- env:
@@ -50,7 +40,6 @@ spec:
name: auth
ports:
- containerPort: 8080
- resources: {}
securityContext:
capabilities:
drop:
@@ -58,4 +47,3 @@ spec:
imagePullSecrets:
- name: regcred
restartPolicy: Always
-status: {}
diff --git a/kubernetes/auth/templates/auth-env-configmap.yaml b/kubernetes/auth/templates/auth-env-configmap.yaml
index dbdd014..63904d6 100644
--- a/kubernetes/auth/templates/auth-env-configmap.yaml
+++ b/kubernetes/auth/templates/auth-env-configmap.yaml
@@ -1,12 +1,11 @@
apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: auth-env
+ labels:
+ app: auth-env
data:
SERVER_AUTH_JWT_KEY: HELLO_HDM
SERVER_AUTH_JWT_VALIDITY: 168h
SERVER_LISTEN_ADDR: 0.0.0.0
SERVER_LISTEN_PORT: "8080"
-kind: ConfigMap
-metadata:
- creationTimestamp: null
- labels:
- io.kompose.service: auth-env
- name: auth-env
diff --git a/kubernetes/auth/templates/auth-service.yaml b/kubernetes/auth/templates/auth-service.yaml
index 6f62c28..3aeb010 100644
--- a/kubernetes/auth/templates/auth-service.yaml
+++ b/kubernetes/auth/templates/auth-service.yaml
@@ -1,19 +1,13 @@
apiVersion: v1
kind: Service
metadata:
- annotations:
- kompose.cmd: kompose convert --chart --controller=deployment --replicas=3 --controller=deployment
- kompose.version: 1.20.0 ()
- creationTimestamp: null
- labels:
- io.kompose.service: auth
name: auth
+ labels:
+ app: auth
spec:
ports:
- name: "8080"
port: 8080
targetPort: 8080
selector:
- io.kompose.service: auth
-status:
- loadBalancer: {}
+ app: auth
--
GitLab