diff --git a/.app.yaml.kate-swp b/.app.yaml.kate-swp new file mode 100644 index 0000000..68f6f0a Binary files /dev/null and b/.app.yaml.kate-swp differ diff --git a/.deployment.yaml.kate-swp b/.deployment.yaml.kate-swp new file mode 100644 index 0000000..efe8d26 Binary files /dev/null and b/.deployment.yaml.kate-swp differ diff --git a/Chart.yaml b/Chart.yaml new file mode 100644 index 0000000..d0034e1 --- /dev/null +++ b/Chart.yaml @@ -0,0 +1,2 @@ +name: memelord +version: 1.0.0 diff --git a/app.yaml b/templates/app.yaml similarity index 98% rename from app.yaml rename to templates/app.yaml index 7f67360..f9c7c31 100644 --- a/app.yaml +++ b/templates/app.yaml @@ -24,7 +24,7 @@ spec: env: - name: DOMAIN - value: "memelord-raiko.ee-lte-1.codemowers.io" + value: "{{ .Values.hostname }}" - name: DB_ENGINE value: "postgres" - name: POSTGRES_USER diff --git a/deployment.yaml b/templates/deployment.yaml similarity index 97% rename from deployment.yaml rename to templates/deployment.yaml index 9a2245d..54bb11f 100644 --- a/deployment.yaml +++ b/templates/deployment.yaml @@ -149,7 +149,7 @@ metadata: spec: secretName: memelord-raiko-tls dnsNames: - - memelord-raiko.ee-lte-1.codemowers.io + - {{ .Values.hostname }} issuerRef: name: letsencrypt kind: ClusterIssuer @@ -163,7 +163,7 @@ metadata: spec: ingressClassName: traefik rules: - - host: memelord-raiko.ee-lte-1.codemowers.io + - host: {{ .Values.hostname }} http: paths: - pathType: Prefix diff --git a/grafana.yaml b/templates/grafana.yaml similarity index 96% rename from grafana.yaml rename to templates/grafana.yaml index 69e5eaf..43a6e4d 100644 --- a/grafana.yaml +++ b/templates/grafana.yaml @@ -79,10 +79,9 @@ spec: value: "http://passmower.passmower.svc.cluster.local/token" - name: GF_AUTH_GENERIC_OAUTH_API_URL value: "http://passmower.passmower.svc.cluster.local/me" - - name: GF_AUTH_GENERIC_OAUTH_SIGNOUT_REDIRECT_URL - value: "https://auth.ee-lte-1.codemowers.io/logout" + # - name: GF_AUTH_GENERIC_OAUTH_SIGNOUT_REDIRECT_URL + # value: "https://auth.ee-lte-1.codemowers.io//openid/session/end" - # Give Admin role to allowed group members - name: GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH value: "contains(groups[*], 'github.com:codemowers:admins') && 'Admin' || Viewer" diff --git a/templates/http-probe.yaml b/templates/http-probe.yaml new file mode 100644 index 0000000..7bd67ff --- /dev/null +++ b/templates/http-probe.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: monitoring.coreos.com/v1 +kind: Probe +metadata: + name: reddit-probe +spec: + module: http_2xx + prober: + url: blackbox-exporter.monitoring.svc.cluster.local + targets: + staticConfig: + static: + - reddit.com diff --git a/values.yaml b/values.yaml new file mode 100644 index 0000000..9ef296e --- /dev/null +++ b/values.yaml @@ -0,0 +1 @@ +hostname: memelord-raiko.ee-lte-1.codemowers.io