From d8449fee246576ea42bb9930219532f3bc88a60b Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Sat, 20 Mar 2021 17:25:56 +0100 Subject: [PATCH] Helm and Kustomize to v0.0.5 (#239) * build(kustomize): ready for v0.0.5 * build(helm): ready for release v0.0.5 --- charts/capsule/Chart.yaml | 4 ++-- charts/capsule/README.md | 2 ++ charts/capsule/templates/deployment.yaml | 2 ++ charts/capsule/values.yaml | 2 ++ config/manager/kustomization.yaml | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/charts/capsule/Chart.yaml b/charts/capsule/Chart.yaml index df5602a9..b432ac94 100644 --- a/charts/capsule/Chart.yaml +++ b/charts/capsule/Chart.yaml @@ -21,8 +21,8 @@ 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.18 +version: 0.0.19 # This is the version number of the application being deployed. # This version number should be incremented each time you make changes to the application. -appVersion: 0.0.4 +appVersion: 0.0.5 diff --git a/charts/capsule/README.md b/charts/capsule/README.md index 05f9ee1d..05ee7199 100644 --- a/charts/capsule/README.md +++ b/charts/capsule/README.md @@ -64,6 +64,8 @@ Parameter | Description | Default `manager.options.forceTenantPrefix` | Boolean, enforces the Tenant owner, during Namespace creation, to name it using the selected Tenant name as prefix, separated by a dash | `false` `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 1a96f543..f90a8921 100644 --- a/charts/capsule/templates/deployment.yaml +++ b/charts/capsule/templates/deployment.yaml @@ -52,6 +52,8 @@ spec: {{ if .Values.manager.options.forceTenantPrefix }}- --force-tenant-prefix={{ .Values.manager.options.forceTenantPrefix }}{{ end }} {{ 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 54c8b3f8..6445361c 100644 --- a/charts/capsule/values.yaml +++ b/charts/capsule/values.yaml @@ -13,6 +13,8 @@ manager: forceTenantPrefix: capsuleUserGroup: protectedNamespaceRegex: + allowIngressHostnameCollision: + allowTenantIngressHostnamesCollision: livenessProbe: httpGet: path: /healthz diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 2fb69314..3defd609 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/clastix/capsule - newTag: v0.0.4 + newTag: v0.0.5