diff --git a/apps/base/podinfo/release.yaml b/apps/base/podinfo/release.yaml index f576678..e62a8ae 100644 --- a/apps/base/podinfo/release.yaml +++ b/apps/base/podinfo/release.yaml @@ -30,7 +30,7 @@ spec: kubernetes.io/ingress.class: "traefik" traefik.ingress.kubernetes.io/router.priority: "4" traefik.ingress.kubernetes.io/router.tls: "true" - traefik.ingress.kubernetes.io/router.tls.domains.0.main: podyinfo.sbtp.xyz + traefik.ingress.kubernetes.io/router.tls.domains.0.main: podinfo.sbtp.xyz traefik.ingress.kubernetes.io/router.entrypoints: http traefik.ingress.kubernetes.io/service.nativelb: podinfo cert-manager.io/cluster-issuer: "letsencrypt" @@ -40,7 +40,6 @@ spec: paths: - path: / pathType: Prefix - tls: - secretName: podinfo-tls hosts: diff --git a/charts/fp/templates/next.yaml b/charts/fp/templates/next.yaml index e1b559b..519f602 100644 --- a/charts/fp/templates/next.yaml +++ b/charts/fp/templates/next.yaml @@ -64,6 +64,8 @@ metadata: name: next namespace: futureporn annotations: + traefik.ingress.kubernetes.io/router.entrypoints: http + traefik.ingress.kubernetes.io/router.tls: true kubernetes.io/ingress.class: traefik cert-manager.io/cluster-issuer: "{{ .Values.next.certIssuer }}" spec: diff --git a/infrastructure/controllers/ingress-traefik.yaml.old b/infrastructure/controllers/ingress-traefik.yaml.old deleted file mode 100644 index e4804cc..0000000 --- a/infrastructure/controllers/ingress-traefik.yaml.old +++ /dev/null @@ -1,127 +0,0 @@ ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 -metadata: - name: traefik-ingress-controller -rules: - - apiGroups: - - "" - resources: - - services - - endpoints - - secrets - verbs: - - get - - list - - watch - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - get - - list - - watch - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 -metadata: - name: traefik-ingress-controller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: traefik-ingress-controller -subjects: -- kind: ServiceAccount - name: traefik-ingress-controller - namespace: kube-system - - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: traefik-ingress-controller - namespace: kube-system - ---- -kind: DaemonSet -apiVersion: apps/v1 -metadata: - name: traefik-ingress-controller - namespace: kube-system - labels: - k8s-app: traefik-ingress-lb -spec: - selector: - matchLabels: - k8s-app: traefik-ingress-lb - name: traefik-ingress-lb - template: - metadata: - labels: - k8s-app: traefik-ingress-lb - name: traefik-ingress-lb - spec: - serviceAccountName: traefik-ingress-controller - terminationGracePeriodSeconds: 60 - containers: - - image: traefik:v1.7 - name: traefik-ingress-lb - ports: - - name: http - containerPort: 80 - hostPort: 80 - - name: admin - containerPort: 8080 - hostPort: 8080 - securityContext: - capabilities: - drop: - - ALL - add: - - NET_BIND_SERVICE - args: - - --api - - --kubernetes - - --logLevel=INFO - ---- -kind: Service -apiVersion: v1 -metadata: - name: traefik-web-ui - namespace: kube-system -spec: - selector: - k8s-app: traefik-ingress-lb - ports: - - protocol: TCP - port: 80 - name: web - - protocol: TCP - port: 8080 - name: admin - ---- -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: traefik-web-ui - namespace: kube-system -spec: - rules: - - host: traefik-ui.minikube - http: - paths: - - path: / - backend: - serviceName: traefik-web-ui - servicePort: web \ No newline at end of file