From 7f5ee35bba4261de649ded9aa8c89201ce11a6aa Mon Sep 17 00:00:00 2001 From: Victor Barba Martin Date: Tue, 16 Nov 2021 00:17:54 +0100 Subject: [PATCH] refactor --- k8s/applications/templates/webrtc-be.yaml | 3 +++ k8s/cert-manager/cluster-issuer-haproxy.yaml | 20 ------------------- k8s/cert-manager/kustomization.yaml | 3 +-- k8s/haproxy-monitoring/kustomization.yaml | 6 ------ .../prometheus-service.yaml | 13 ------------ k8s/haproxy-monitoring/service-monitor.yaml | 18 ----------------- k8s/webrtc-be/Chart.yaml | 3 +++ k8s/webrtc-be/{ => templates}/deployment.yml | 0 k8s/webrtc-be/{ => templates}/gcr-secret.yml | 0 k8s/webrtc-be/{ => templates}/ingress.yaml | 2 +- k8s/webrtc-be/{ => templates}/service.yml | 0 k8s/webrtc-be/values-staging.yaml | 1 + 12 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 k8s/cert-manager/cluster-issuer-haproxy.yaml delete mode 100644 k8s/haproxy-monitoring/kustomization.yaml delete mode 100644 k8s/haproxy-monitoring/prometheus-service.yaml delete mode 100644 k8s/haproxy-monitoring/service-monitor.yaml create mode 100644 k8s/webrtc-be/Chart.yaml rename k8s/webrtc-be/{ => templates}/deployment.yml (100%) rename k8s/webrtc-be/{ => templates}/gcr-secret.yml (100%) rename k8s/webrtc-be/{ => templates}/ingress.yaml (88%) rename k8s/webrtc-be/{ => templates}/service.yml (100%) create mode 100644 k8s/webrtc-be/values-staging.yaml diff --git a/k8s/applications/templates/webrtc-be.yaml b/k8s/applications/templates/webrtc-be.yaml index 5bb6974..93c6b66 100644 --- a/k8s/applications/templates/webrtc-be.yaml +++ b/k8s/applications/templates/webrtc-be.yaml @@ -8,6 +8,9 @@ spec: namespace: webrtc-be server: 'https://kubernetes.default.svc' source: + helm: + valueFiles: + - values-{{ .Values.environment }}.yaml path: k8s/webrtc-be repoURL: 'git@bitbucket.org:jamkazam/video-iac.git' targetRevision: HEAD diff --git a/k8s/cert-manager/cluster-issuer-haproxy.yaml b/k8s/cert-manager/cluster-issuer-haproxy.yaml deleted file mode 100644 index efa4922..0000000 --- a/k8s/cert-manager/cluster-issuer-haproxy.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: letsencrypt-haproxy-production -spec: - acme: - # You must replace this email address with your own. - # Let's Encrypt will use this to contact you about expiring - # certificates, and issues related to your account. - email: victor.barba.martin@toptal.com - server: https://acme-v02.api.letsencrypt.org/directory - privateKeySecretRef: - # Secret resource that will be used to store the account's private key. - name: haproxy-issuer-account-key - # Add a single challenge solver, HTTP01 using nginx - solvers: - - http01: - ingress: - class: haproxy - diff --git a/k8s/cert-manager/kustomization.yaml b/k8s/cert-manager/kustomization.yaml index d27a005..25ea5d4 100644 --- a/k8s/cert-manager/kustomization.yaml +++ b/k8s/cert-manager/kustomization.yaml @@ -4,5 +4,4 @@ kind: Kustomization resources: - https://github.com/jetstack/cert-manager/releases/download/v1.6.0/cert-manager.yaml - - cluster-issuer-nginx.yaml - #- cluster-issuer-haproxy.yaml \ No newline at end of file + - cluster-issuer-nginx.yaml \ No newline at end of file diff --git a/k8s/haproxy-monitoring/kustomization.yaml b/k8s/haproxy-monitoring/kustomization.yaml deleted file mode 100644 index 79f53e0..0000000 --- a/k8s/haproxy-monitoring/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: argocd - -resources: \ No newline at end of file diff --git a/k8s/haproxy-monitoring/prometheus-service.yaml b/k8s/haproxy-monitoring/prometheus-service.yaml deleted file mode 100644 index d3c90fd..0000000 --- a/k8s/haproxy-monitoring/prometheus-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: haproxy-exporter - namespace: ingress-controller -spec: - ports: - - name: exporter - port: 9105 - targetPort: exporter - selector: - app.kubernetes.io/instance: haproxy-ingress - app.kubernetes.io/name: haproxy-ingress \ No newline at end of file diff --git a/k8s/haproxy-monitoring/service-monitor.yaml b/k8s/haproxy-monitoring/service-monitor.yaml deleted file mode 100644 index c0828cd..0000000 --- a/k8s/haproxy-monitoring/service-monitor.yaml +++ /dev/null @@ -1,18 +0,0 @@ - -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: haproxy - labels: - app: haproxy - release: monitoring -spec: - selector: - matchLabels: - app.kubernetes.io/instance: haproxy-ingress - app.kubernetes.io/name: haproxy-ingress - namespaceSelector: - matchNames: - - ingress-controller - podMetricsEndpoints: - - port: exporter \ No newline at end of file diff --git a/k8s/webrtc-be/Chart.yaml b/k8s/webrtc-be/Chart.yaml new file mode 100644 index 0000000..f852c00 --- /dev/null +++ b/k8s/webrtc-be/Chart.yaml @@ -0,0 +1,3 @@ +apiVersion: v2 +name: webrtc +version: '1.0' diff --git a/k8s/webrtc-be/deployment.yml b/k8s/webrtc-be/templates/deployment.yml similarity index 100% rename from k8s/webrtc-be/deployment.yml rename to k8s/webrtc-be/templates/deployment.yml diff --git a/k8s/webrtc-be/gcr-secret.yml b/k8s/webrtc-be/templates/gcr-secret.yml similarity index 100% rename from k8s/webrtc-be/gcr-secret.yml rename to k8s/webrtc-be/templates/gcr-secret.yml diff --git a/k8s/webrtc-be/ingress.yaml b/k8s/webrtc-be/templates/ingress.yaml similarity index 88% rename from k8s/webrtc-be/ingress.yaml rename to k8s/webrtc-be/templates/ingress.yaml index 6127e3a..fbfc35b 100644 --- a/k8s/webrtc-be/ingress.yaml +++ b/k8s/webrtc-be/templates/ingress.yaml @@ -9,7 +9,7 @@ metadata: name: webrtc-be spec: rules: - - host: &host webrtc-be.staging.video.jamkazam.com + - host: &host {{ .Values.domain }} http: paths: - backend: diff --git a/k8s/webrtc-be/service.yml b/k8s/webrtc-be/templates/service.yml similarity index 100% rename from k8s/webrtc-be/service.yml rename to k8s/webrtc-be/templates/service.yml diff --git a/k8s/webrtc-be/values-staging.yaml b/k8s/webrtc-be/values-staging.yaml new file mode 100644 index 0000000..e5d12fe --- /dev/null +++ b/k8s/webrtc-be/values-staging.yaml @@ -0,0 +1 @@ +domain: "webrtc-be.staging.video.jamkazam.com" \ No newline at end of file