From 7c368436b2c12f5998cb4ee7818fa5cb570e665b Mon Sep 17 00:00:00 2001 From: pinghe Date: Fri, 17 Feb 2023 12:09:13 +0800 Subject: [PATCH 1/3] Update traefik.cue Add configurability to the ipFamilyPolicy and annotations properties of the service --- addons/traefik/resources/traefik.cue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/traefik/resources/traefik.cue b/addons/traefik/resources/traefik.cue index 8cb3d954..edcf102e 100644 --- a/addons/traefik/resources/traefik.cue +++ b/addons/traefik/resources/traefik.cue @@ -19,6 +19,13 @@ output: { } service: { type: parameter.serviceType + ipFamilyPolicy: parameter.ipFamilyPolicy + ipFamilies: [ "IPv4", "IPv6" ] + annotations: { + for entry in parameter.annotations { + "\(entry.name)": entry.value + } + } } if parameter.autoscaling != _|_ { autoscaling: { From 65b8d32aad12b86f6510ca919e7549a814a795f7 Mon Sep 17 00:00:00 2001 From: pinghe Date: Fri, 17 Feb 2023 12:15:59 +0800 Subject: [PATCH 2/3] Update parameter.cue add params --- addons/traefik/resources/parameter.cue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/traefik/resources/parameter.cue b/addons/traefik/resources/parameter.cue index dffdeea7..5faafefb 100644 --- a/addons/traefik/resources/parameter.cue +++ b/addons/traefik/resources/parameter.cue @@ -11,6 +11,14 @@ parameter: { entryPoints?: [...{ name: string port: int + exposedPort: int protocol: *"TCP" | "UDP" }] + // +usage=Specify the service ip family policy. + ipFamilyPolicy: *"PreferDualStack" | "SingleStack" | "RequireDualStack" + // +usage=Specify the service annotations. + annotations?: [...{ + name: string + value: string + }] } From d9c41fb44a62a52c4de086692db4009e85367232 Mon Sep 17 00:00:00 2001 From: pinghe Date: Fri, 17 Feb 2023 12:17:02 +0800 Subject: [PATCH 3/3] Update metadata.yaml update version to v2.6.3-3 --- addons/traefik/metadata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/traefik/metadata.yaml b/addons/traefik/metadata.yaml index 58780c72..5707d336 100644 --- a/addons/traefik/metadata.yaml +++ b/addons/traefik/metadata.yaml @@ -1,5 +1,5 @@ name: traefik -version: v2.6.3-2 +version: v2.6.3-3 description: The Cloud Native Application Proxy, Simplify networking complexity while designing, deploying, and operating applications. icon: https://traefik.io/static/traefik-proxy-logo--white-82153be41e0ce620a921b4bce974f6d8.svg url: https://traefik.io/traefik @@ -16,4 +16,4 @@ deployTo: runtimeCluster: true system: - vela: ">=v1.6.0-alpha.6" \ No newline at end of file + vela: ">=v1.6.0-alpha.6"