From 232f739e5dd4b3a6cad034d8240fb0a68ccdf495 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Thu, 14 Feb 2019 15:58:31 -0800
Subject: [PATCH] Fix gitea k8s files

The secret file needs different yaml template handling due to
multiline strings, and the service has a duplicate name.

Change-Id: I9930c4ff713ba87e1b4c819f6c80cab5b0ffd165
---
 kubernetes/gitea/gitea-playbook.yaml | 18 +++++++++++++++++-
 kubernetes/gitea/k8s/secret.yaml     | 14 --------------
 kubernetes/gitea/k8s/service.yaml    |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 kubernetes/gitea/k8s/secret.yaml

diff --git a/kubernetes/gitea/gitea-playbook.yaml b/kubernetes/gitea/gitea-playbook.yaml
index 3aa3728db9..1a2ccd7560 100644
--- a/kubernetes/gitea/gitea-playbook.yaml
+++ b/kubernetes/gitea/gitea-playbook.yaml
@@ -5,11 +5,27 @@
         context: gitea
         state: present
         definition: "{{ lookup('template', 'k8s/namespace.yaml') | from_yaml }}"
+    # This is not in a file because that doesn't seem to handle multiline
+    # strings well.
     - name: Set up gitea secrets
       k8s:
         context: gitea
         state: present
-        definition: "{{ lookup('template', 'k8s/secret.yaml') | from_yaml }}"
+        definition:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: gitea-app
+            namespace: gitea
+          type: Opaque
+          stringData:
+            secret_key: "{{ gitea_secret_key }}"
+            internal_token: "{{ gitea_internal_token }}"
+            lfs_jwt_secret: "{{ gitea_lfs_jwt_secret }}"
+            db_username: "{{ gitea_db_username }}"
+            db_password: "{{ gitea_db_password }}"
+            gitea_tls_cert: "{{ gitea_tls_cert }}"
+            gitea_tls_key: "{{ gitea_tls_key }}"
     - name: Set up gitea configmap
       k8s:
         context: gitea
diff --git a/kubernetes/gitea/k8s/secret.yaml b/kubernetes/gitea/k8s/secret.yaml
deleted file mode 100644
index c119995278..0000000000
--- a/kubernetes/gitea/k8s/secret.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: gitea-app
-  namespace: gitea
-type: Opaque
-stringData:
-  secret_key: {{ gitea_secret_key }}
-  internal_token: {{ gitea_internal_token }}
-  lfs_jwt_secret: {{ gitea_lfs_jwt_secret }}
-  db_username: {{ gitea_db_username }}
-  db_password: {{ gitea_db_password }}
-  gitea_tls_cert: {{ gitea_tls_cert }}
-  gitea_tls_key: {{ gitea_tls_key }}
diff --git a/kubernetes/gitea/k8s/service.yaml b/kubernetes/gitea/k8s/service.yaml
index 3ce9f04a47..9d34e81ea2 100644
--- a/kubernetes/gitea/k8s/service.yaml
+++ b/kubernetes/gitea/k8s/service.yaml
@@ -14,7 +14,7 @@ spec:
     - protocol: TCP
       port: 443
       targetPort: 3000
-      name: http
+      name: https
     - protocol: TCP
       port: 22
       targetPort: 22