diff --git a/charts/flagger/README.md b/charts/flagger/README.md index 6ff665ae..631ed472 100644 --- a/charts/flagger/README.md +++ b/charts/flagger/README.md @@ -79,6 +79,7 @@ To install Flagger and Prometheus for **Contour**: $ helm upgrade -i flagger flagger/flagger \ --namespace=projectcontour \ --set meshProvider=contour \ + --set ingressClass=contour \ --set prometheus.install=true ``` @@ -135,6 +136,8 @@ Parameter | Description | Default `tolerations` | List of node taints to tolerate | `[]` `istio.kubeconfig.secretName` | The name of the Kubernetes secret containing the Istio shared control plane kubeconfig | None `istio.kubeconfig.key` | The name of Kubernetes secret data key that contains the Istio control plane kubeconfig | `kubeconfig` +`ingressAnnotationsPrefix` | Annotations prefix for NGINX ingresses | None +`ingressClass` | Ingress class used for annotating HTTPProxy objects, e.g. `contour` | None Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade`. For example, diff --git a/charts/flagger/templates/deployment.yaml b/charts/flagger/templates/deployment.yaml index f4934857..9666a15f 100644 --- a/charts/flagger/templates/deployment.yaml +++ b/charts/flagger/templates/deployment.yaml @@ -103,6 +103,9 @@ spec: {{- if .Values.ingressAnnotationsPrefix }} - -ingress-annotations-prefix={{ .Values.ingressAnnotationsPrefix }} {{- end }} + {{- if .Values.ingressClass }} + - -ingress-class={{ .Values.ingressClass }} + {{- end }} {{- if .Values.eventWebhook }} - -event-webhook={{ .Values.eventWebhook }} {{- end }} diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml index 9ff73da0..5b8fa00f 100644 --- a/charts/flagger/values.yaml +++ b/charts/flagger/values.yaml @@ -30,6 +30,12 @@ selectorLabels: "" configTracking: enabled: true +# annotations prefix for NGINX ingresses +ingressAnnotationsPrefix: "" + +# ingress class used for annotating HTTPProxy objects +ingressClass: "" + # when enabled, it will add a security context for the flagger pod. You may # need to disable this if you are running flagger on OpenShift securityContext: