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
This commit is contained in:
James E. Blair 2019-02-14 15:58:31 -08:00
parent 0c066aab89
commit 232f739e5d
3 changed files with 18 additions and 16 deletions

View File

@ -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

View File

@ -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 }}

View File

@ -14,7 +14,7 @@ spec:
- protocol: TCP
port: 443
targetPort: 3000
name: http
name: https
- protocol: TCP
port: 22
targetPort: 22