diff --git a/charts/capsule/Chart.yaml b/charts/capsule/Chart.yaml index 4002a49e..3e73735a 100644 --- a/charts/capsule/Chart.yaml +++ b/charts/capsule/Chart.yaml @@ -21,7 +21,7 @@ sources: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.0.16 +version: 0.0.17 # This is the version number of the application being deployed. # This version number should be incremented each time you make changes to the application. diff --git a/charts/capsule/README.md b/charts/capsule/README.md index b6f76001..654d3b1d 100644 --- a/charts/capsule/README.md +++ b/charts/capsule/README.md @@ -65,6 +65,7 @@ Parameter | Description | Default `manager.options.capsuleUserGroup` | Override the Capsule user group | `capsule.clastix.io` `manager.options.protectedNamespaceRegex` | If specified, disallows creation of namespaces matching the passed regexp | `null` `manager.options.allowIngressHostnameCollision` | Allow the Ingress hostname collision at Ingress resource level across all the Tenants | `true` +`manager.options.allowTenantIngressHostnamesCollision` | Skip the validation check at Tenant level for colliding Ingress hostnames | `false` `manager.image.repository` | Set the image repository of the controller. | `quay.io/clastix/capsule` `manager.image.tag` | Overrides the image tag whose default is the chart. `appVersion` | `null` `manager.image.pullPolicy` | Set the image pull policy. | `IfNotPresent` diff --git a/charts/capsule/templates/deployment.yaml b/charts/capsule/templates/deployment.yaml index fe939e84..f90a8921 100644 --- a/charts/capsule/templates/deployment.yaml +++ b/charts/capsule/templates/deployment.yaml @@ -53,6 +53,7 @@ spec: {{ if .Values.manager.options.capsuleUserGroup }}- --capsule-user-group={{ .Values.manager.options.capsuleUserGroup }}{{ end }} {{ if .Values.manager.options.protectedNamespaceRegex }}- --protected-namespace-regex={{ .Values.manager.options.protectedNamespaceRegex }}{{ end }} - --allow-ingress-hostname-collision={{ .Values.manager.options.allowIngressHostnameCollision | default "true" }} + - --allow-tenant-ingress-hostnames-collision={{ .Values.manager.allowTenantIngressHostnamesCollision | default "false" }} image: {{ include "capsule.managerFullyQualifiedDockerImage" . }} imagePullPolicy: {{ .Values.manager.image.pullPolicy }} env: diff --git a/charts/capsule/values.yaml b/charts/capsule/values.yaml index cd5822ea..6445361c 100644 --- a/charts/capsule/values.yaml +++ b/charts/capsule/values.yaml @@ -14,6 +14,7 @@ manager: capsuleUserGroup: protectedNamespaceRegex: allowIngressHostnameCollision: + allowTenantIngressHostnamesCollision: livenessProbe: httpGet: path: /healthz @@ -22,6 +23,7 @@ manager: httpGet: path: /readyz port: 10080 + resources: limits: cpu: 200m