Skip to content

Commit 959562e

Browse files
committed
List valid mesh providers in CRD and help docs
the list of values was incomplete in the cli help, the flagger chart, and was not present as an enum in the CRD Signed-off-by: Mara Furland <mara@fur.land>
1 parent d4cc9bf commit 959562e

5 files changed

Lines changed: 62 additions & 2 deletions

File tree

artifacts/flagger/crd.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,26 @@ spec:
8585
provider:
8686
description: Traffic managent provider
8787
type: string
88+
enum:
89+
- apisix
90+
- appmesh
91+
- appmesh:v1beta2
92+
- contour
93+
- gatewayapi:v1
94+
- gatewayapi:v1beta1
95+
- gloo
96+
- istio
97+
- knative
98+
- kubernetes
99+
- kuma
100+
- linkerd
101+
- nginx
102+
- osm
103+
- skipper
104+
- smi:v1alpha1
105+
- smi:v1alpha2
106+
- smi:v1alpha3
107+
- traefik
88108
metricsServer:
89109
description: Prometheus URL
90110
type: string

charts/flagger/crds/crd.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,26 @@ spec:
8585
provider:
8686
description: Traffic managent provider
8787
type: string
88+
enum:
89+
- apisix
90+
- appmesh
91+
- appmesh:v1beta2
92+
- contour
93+
- gatewayapi:v1
94+
- gatewayapi:v1beta1
95+
- gloo
96+
- istio
97+
- knative
98+
- kubernetes
99+
- kuma
100+
- linkerd
101+
- nginx
102+
- osm
103+
- skipper
104+
- smi:v1alpha1
105+
- smi:v1alpha2
106+
- smi:v1alpha3
107+
- traefik
88108
metricsServer:
89109
description: Prometheus URL
90110
type: string

charts/flagger/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ serviceMonitor:
3232
# Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator
3333
# labels:
3434

35-
# accepted values are kubernetes, istio, linkerd, appmesh, contour, nginx, gloo, skipper, traefik, apisix
35+
# accepted values are apisix, appmesh, appmesh:v1beta2, contour, gatewayapi:v1, gatewayapi:v1beta1, gloo, istio, knative, kubernetes, kuma, linkerd, nginx, osm, skipper, smi:v1alpha1, smi:v1alpha2, smi:v1alpha3, traefik
3636
meshProvider: ""
3737

3838
# single namespace restriction

cmd/flagger/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func init() {
112112
flag.BoolVar(&zapReplaceGlobals, "zap-replace-globals", false, "Whether to change the logging level of the global zap logger.")
113113
flag.StringVar(&zapEncoding, "zap-encoding", "json", "Zap logger encoding.")
114114
flag.StringVar(&namespace, "namespace", "", "Namespace that flagger would watch canary object.")
115-
flag.StringVar(&meshProvider, "mesh-provider", "istio", "Service mesh provider, can be istio, linkerd, appmesh, contour, knative, gloo, nginx, skipper, traefik, apisix, osm or kuma.")
115+
flag.StringVar(&meshProvider, "mesh-provider", "istio", "Service mesh provider, can be apisix, appmesh, appmesh:v1beta2, contour, gatewayapi:v1, gatewayapi:v1beta1, gloo, istio, knative, kubernetes, kuma, linkerd, nginx, osm, skipper, smi:v1alpha1, smi:v1alpha2, smi:v1alpha3, or traefik.")
116116
flag.StringVar(&selectorLabels, "selector-labels", "app,name,app.kubernetes.io/name", "List of pod labels that Flagger uses to create pod selectors.")
117117
flag.StringVar(&ingressAnnotationsPrefix, "ingress-annotations-prefix", "nginx.ingress.kubernetes.io", "Annotations prefix for NGINX ingresses.")
118118
flag.StringVar(&ingressClass, "ingress-class", "", "Ingress class used for annotating HTTPProxy objects.")

kustomize/base/flagger/crd.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,26 @@ spec:
8585
provider:
8686
description: Traffic managent provider
8787
type: string
88+
enum:
89+
- apisix
90+
- appmesh
91+
- appmesh:v1beta2
92+
- contour
93+
- gatewayapi:v1
94+
- gatewayapi:v1beta1
95+
- gloo
96+
- istio
97+
- knative
98+
- kubernetes
99+
- kuma
100+
- linkerd
101+
- nginx
102+
- osm
103+
- skipper
104+
- smi:v1alpha1
105+
- smi:v1alpha2
106+
- smi:v1alpha3
107+
- traefik
88108
metricsServer:
89109
description: Prometheus URL
90110
type: string

0 commit comments

Comments
 (0)