diff --git a/manifests/auth-proxy/non-auth-proxy.yaml b/manifests/auth-proxy/non-auth-proxy.yaml index 5ab2e81..df5ae5e 100644 --- a/manifests/auth-proxy/non-auth-proxy.yaml +++ b/manifests/auth-proxy/non-auth-proxy.yaml @@ -11,7 +11,6 @@ data: "tekton-el.auth-proxy.svc": "tekton-el.cluster.local", "home.auth-proxy.svc": "home.cluster.local", "home.cluster.fun": "home.cluster.local", - "podify.cluster.fun": "podify.cluster.local", "prometheus.auth-proxy.svc": "prometheus.cluster.local", "loki.auth-proxy.svc": "loki.cluster.local" } @@ -105,6 +104,40 @@ spec: app: internal-proxy type: ClusterIP --- +apiVersion: v1 +kind: Service +metadata: + name: loki + namespace: auth-proxy + labels: + app: internal-proxy +spec: + ports: + - name: http + port: 80 + protocol: TCP + targetPort: 8080 + selector: + app: internal-proxy + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + name: prometheus + namespace: auth-proxy + labels: + app: internal-proxy +spec: + ports: + - name: http + port: 80 + protocol: TCP + targetPort: 8080 + selector: + app: internal-proxy + type: ClusterIP +--- apiVersion: apps/v1 @@ -230,7 +263,6 @@ spec: tls: - hosts: - home.cluster.fun - - podify.cluster.fun secretName: non-auth-proxy-ingress rules: - host: home.cluster.fun @@ -243,13 +275,3 @@ spec: name: non-auth-proxy port: name: http - - host: podify.cluster.fun - http: - paths: - - path: / - pathType: ImplementationSpecific - backend: - service: - name: non-auth-proxy - port: - name: http diff --git a/manifests/monitoring/inges.yaml b/manifests/monitoring/inges.yaml index 336427b..3b9bead 100644 --- a/manifests/monitoring/inges.yaml +++ b/manifests/monitoring/inges.yaml @@ -62,6 +62,7 @@ metadata: annotations: kube-1password: m7c2n5gqybiyxj6ylydju2nljm kube-1password/vault: Kubernetes + kube-1password/password-key: auth type: Opaque --- apiVersion: networking.k8s.io/v1 @@ -74,8 +75,8 @@ metadata: annotations: cert-manager.io/cluster-issuer: letsencrypt nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - ingress.kubernetes.io/auth-type: basic - ingress.kubernetes.io/auth-secret: prometheus-credentials + nginx.ingress.kubernetes.io/auth-type: basic + nginx.ingress.kubernetes.io/auth-secret: prometheus-credentials spec: ingressClassName: nginx tls: diff --git a/manifests/monitoring/prometheus-server.yaml b/manifests/monitoring/prometheus-server.yaml index ffaed93..3d04f33 100644 --- a/manifests/monitoring/prometheus-server.yaml +++ b/manifests/monitoring/prometheus-server.yaml @@ -417,7 +417,7 @@ spec: matchLabels: app.kubernetes.io/name: prometheus app.kubernetes.io/component: server - replicas: 0 + replicas: 1 template: metadata: labels: