Skip to content

Commit 9f7cec3

Browse files
committed
fix(controller): traefik ingress create error
1 parent 6517759 commit 9f7cec3

File tree

9 files changed

+342
-266
lines changed

9 files changed

+342
-266
lines changed

charts/controller/templates/controller-clusterrole.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,7 @@ rules:
7373
- apiGroups: ["servicecatalog.k8s.io"]
7474
resources: ["serviceinstances", "servicebindings"]
7575
verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
76+
- apiGroups: ["traefik.containo.us"]
77+
resources: ["middlewares"]
78+
verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
7679
{{- end -}}

charts/controller/templates/controller-ingress.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ metadata:
99
heritage: "{{ .Release.Service }}"
1010
annotations:
1111
kubernetes.io/tls-acme: "true"
12-
{{- if not (eq .Values.global.ingressClass "") }}
13-
kubernetes.io/ingress.class: "{{ .Values.global.ingressClass }}"
14-
{{- end }}
1512
spec:
13+
{{- if not (eq .Values.global.ingressClass "") }}
14+
ingressClassName: "{{ .Values.global.ingressClass }}"
15+
{{- end }}
1616
rules:
1717
- host: drycc.{{ .Values.global.platformDomain }}
1818
http:

rootfs/api/models/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def refresh(self):
215215
if not app_settings.routable:
216216
return
217217
tls = self.tls_set.latest()
218-
ssl_redirect = "true" if bool(tls.https_enforced) else "false"
218+
ssl_redirect = bool(tls.https_enforced)
219219
certs_auto_enabled = bool(tls.certs_auto_enabled)
220220
hosts, tls_map = [], defaultdict(list)
221221
for domain in Domain.objects.filter(app=self):

rootfs/api/settings/production.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
SECRET_KEY = os.environ.get('DRYCC_SECRET_KEY', random_secret)
275275
BUILDER_KEY = os.environ.get('DRYCC_BUILDER_KEY', random_secret)
276276

277-
# experimental native ingress
277+
# ingress class name
278278
INGRESS_CLASS = os.environ.get('DRYCC_INGRESS_CLASS', '')
279279

280280
PLATFORM_DOMAIN = os.environ.get('DRYCC_PLATFORM_DOMAIN', 'local.drycc.cc')

rootfs/scheduler/resources/ingress.py

Lines changed: 0 additions & 261 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
from .base import IngressFactory, WildcardPathIngress
2+
from .nginx import NginxIngress
3+
from .traefik import TraefikIngress
4+
5+
6+
IngressFactory.register("gce", WildcardPathIngress)
7+
IngressFactory.register("alb", WildcardPathIngress)
8+
IngressFactory.register("traefik", TraefikIngress)
9+
IngressFactory.register("nginx", NginxIngress)

0 commit comments

Comments
 (0)