diff --git a/src/main/charts/bamboo/README.md b/src/main/charts/bamboo/README.md index d2070c051..3edfe6a59 100644 --- a/src/main/charts/bamboo/README.md +++ b/src/main/charts/bamboo/README.md @@ -119,7 +119,7 @@ Kubernetes: `>=1.21.x-0` | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.repository | string | `"atlassian/bamboo"` | The Bamboo Docker image to use https://hub.docker.com/r/atlassian/bamboo-server | | image.tag | string | `""` | The docker image tag to be used - defaults to the Chart appVersion | -| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource when NOT using the K8s ingress-nginx controller. | +| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource. If using an ingress-nginx controller be sure that the annotations you add here are compatible with those already defined in the 'ingess.yaml' template | | ingress.className | string | `"nginx"` | The class name used by the ingress controller if it's being used. Please follow documenation of your ingress controller. If the cluster contains multiple ingress controllers, this setting allows you to control which of them is used for Atlassian application traffic. | | ingress.create | bool | `false` | Set to 'true' if an Ingress Resource should be created. This depends on a pre-provisioned Ingress Controller being available. | | ingress.host | string | `nil` | The fully-qualified hostname (FQDN) of the Ingress Resource. Traffic coming in on this hostname will be routed by the Ingress Resource to the appropriate backend Service. | diff --git a/src/main/charts/bamboo/values.yaml b/src/main/charts/bamboo/values.yaml index c7b8671cb..e9557d93a 100644 --- a/src/main/charts/bamboo/values.yaml +++ b/src/main/charts/bamboo/values.yaml @@ -366,8 +366,9 @@ ingress: # path: - # -- The custom annotations that should be applied to the Ingress Resource - # when NOT using the K8s ingress-nginx controller. + # -- The custom annotations that should be applied to the Ingress Resource. + # If using an ingress-nginx controller be sure that the annotations you add + # here are compatible with those already defined in the 'ingess.yaml' template # annotations: {} diff --git a/src/main/charts/bitbucket/README.md b/src/main/charts/bitbucket/README.md index 358801fe4..d597dbd7b 100644 --- a/src/main/charts/bitbucket/README.md +++ b/src/main/charts/bitbucket/README.md @@ -157,7 +157,7 @@ Kubernetes: `>=1.21.x-0` | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.repository | string | `"atlassian/bitbucket"` | The Bitbucket Docker image to use https://hub.docker.com/r/atlassian/bitbucket-server | | image.tag | string | `""` | The docker image tag to be used - defaults to the Chart appVersion | -| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource when NOT using the K8s ingress-nginx controller. | +| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource. If using an ingress-nginx controller be sure that the annotations you add here are compatible with those already defined in the 'ingess.yaml' template | | ingress.className | string | `"nginx"` | The class name used by the ingress controller if it's being used. Please follow documentation of your ingress controller. If the cluster contains multiple ingress controllers, this setting allows you to control which of them is used for Atlassian application traffic. | | ingress.create | bool | `false` | Set to 'true' if an Ingress Resource should be created. This depends on a pre-provisioned Ingress Controller being available. | | ingress.host | string | `nil` | The fully-qualified hostname (FQDN) of the Ingress Resource. Traffic coming in on this hostname will be routed by the Ingress Resource to the appropriate backend Service. | diff --git a/src/main/charts/bitbucket/values.yaml b/src/main/charts/bitbucket/values.yaml index 33c26b816..c8894d41d 100644 --- a/src/main/charts/bitbucket/values.yaml +++ b/src/main/charts/bitbucket/values.yaml @@ -450,8 +450,9 @@ ingress: # path: - # -- The custom annotations that should be applied to the Ingress Resource - # when NOT using the K8s ingress-nginx controller. + # -- The custom annotations that should be applied to the Ingress Resource. + # If using an ingress-nginx controller be sure that the annotations you add + # here are compatible with those already defined in the 'ingess.yaml' template # annotations: {} diff --git a/src/main/charts/confluence/README.md b/src/main/charts/confluence/README.md index 7d0ce0904..4dbb00dbc 100644 --- a/src/main/charts/confluence/README.md +++ b/src/main/charts/confluence/README.md @@ -118,7 +118,7 @@ Kubernetes: `>=1.21.x-0` | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.repository | string | `"atlassian/confluence"` | The Confluence Docker image to use https://hub.docker.com/r/atlassian/confluence-server | | image.tag | string | `""` | The docker image tag to be used - defaults to the Chart appVersion | -| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource when NOT using the K8s ingress-nginx controller. | +| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource. If using an ingress-nginx controller be sure that the annotations you add here are compatible with those already defined in the 'ingess.yaml' template | | ingress.className | string | `"nginx"` | The class name used by the ingress controller if it's being used. Please follow documentation of your ingress controller. If the cluster contains multiple ingress controllers, this setting allows you to control which of them is used for Atlassian application traffic. | | ingress.create | bool | `false` | Set to 'true' if an Ingress Resource should be created. This depends on a pre-provisioned Ingress Controller being available. | | ingress.host | string | `nil` | The fully-qualified hostname (FQDN) of the Ingress Resource. Traffic coming in on this hostname will be routed by the Ingress Resource to the appropriate backend Service. | diff --git a/src/main/charts/confluence/values.yaml b/src/main/charts/confluence/values.yaml index 11cfb86d0..e0df84202 100644 --- a/src/main/charts/confluence/values.yaml +++ b/src/main/charts/confluence/values.yaml @@ -469,8 +469,9 @@ ingress: # 'company.k8s.com/confluence'. Default value is 'confluence.service.contextPath' path: - # -- The custom annotations that should be applied to the Ingress Resource - # when NOT using the K8s ingress-nginx controller. + # -- The custom annotations that should be applied to the Ingress Resource. + # If using an ingress-nginx controller be sure that the annotations you add + # here are compatible with those already defined in the 'ingess.yaml' template # annotations: {} diff --git a/src/main/charts/crowd/README.md b/src/main/charts/crowd/README.md index 8ad0b8575..c1de6a422 100644 --- a/src/main/charts/crowd/README.md +++ b/src/main/charts/crowd/README.md @@ -93,7 +93,7 @@ Kubernetes: `>=1.21.x-0` | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.repository | string | `"atlassian/crowd"` | The Docker Crowd Docker image to use https://hub.docker.com/r/atlassian/crowd | | image.tag | string | `""` | The docker image tag to be used. Defaults to appVersion in Chart.yaml | -| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource when NOT using the K8s ingress-nginx controller. | +| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource. If using an ingress-nginx controller be sure that the annotations you add here are compatible with those already defined in the 'ingess.yaml' template | | ingress.className | string | `"nginx"` | The class name used by the ingress controller if it's being used. Please follow documentation of your ingress controller. If the cluster contains multiple ingress controllers, this setting allows you to control which of them is used for Atlassian application traffic. | | ingress.create | bool | `false` | Set to 'true' if an Ingress Resource should be created. This depends on a pre-provisioned Ingress Controller being available. | | ingress.host | string | `nil` | The fully-qualified hostname (FQDN) of the Ingress Resource. Traffic coming in on this hostname will be routed by the Ingress Resource to the appropriate backend Service. | diff --git a/src/main/charts/crowd/values.yaml b/src/main/charts/crowd/values.yaml index 0a33523b7..306682baa 100644 --- a/src/main/charts/crowd/values.yaml +++ b/src/main/charts/crowd/values.yaml @@ -464,8 +464,9 @@ ingress: # path: "/" - # -- The custom annotations that should be applied to the Ingress Resource - # when NOT using the K8s ingress-nginx controller. + # -- The custom annotations that should be applied to the Ingress Resource. + # If using an ingress-nginx controller be sure that the annotations you add + # here are compatible with those already defined in the 'ingess.yaml' template # annotations: {} diff --git a/src/main/charts/jira/README.md b/src/main/charts/jira/README.md index 3cdc67ab2..cb3e7e882 100644 --- a/src/main/charts/jira/README.md +++ b/src/main/charts/jira/README.md @@ -51,7 +51,7 @@ Kubernetes: `>=1.21.x-0` | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.repository | string | `"atlassian/jira-software"` | The Jira Docker image to use https://hub.docker.com/r/atlassian/jira-software | | image.tag | string | `""` | The docker image tag to be used - defaults to the Chart appVersion | -| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource when NOT using the K8s ingress-nginx controller. | +| ingress.annotations | object | `{}` | The custom annotations that should be applied to the Ingress Resource. If using an ingress-nginx controller be sure that the annotations you add here are compatible with those already defined in the 'ingess.yaml' template | | ingress.className | string | `"nginx"` | The class name used by the ingress controller if it's being used. Please follow documentation of your ingress controller. If the cluster contains multiple ingress controllers, this setting allows you to control which of them is used for Atlassian application traffic. | | ingress.create | bool | `false` | Set to 'true' if an Ingress Resource should be created. This depends on a pre-provisioned Ingress Controller being available. | | ingress.host | string | `nil` | The fully-qualified hostname (FQDN) of the Ingress Resource. Traffic coming in on this hostname will be routed by the Ingress Resource to the appropriate backend Service. | diff --git a/src/main/charts/jira/values.yaml b/src/main/charts/jira/values.yaml index f55a29480..0f394927d 100644 --- a/src/main/charts/jira/values.yaml +++ b/src/main/charts/jira/values.yaml @@ -377,8 +377,9 @@ ingress: # path: - # -- The custom annotations that should be applied to the Ingress Resource - # when NOT using the K8s ingress-nginx controller. + # -- The custom annotations that should be applied to the Ingress Resource. + # If using an ingress-nginx controller be sure that the annotations you add + # here are compatible with those already defined in the 'ingess.yaml' template # annotations: {}