Get rid of server repo references (#777)

Co-authored-by: Yevhen Ivantsov <yivantsov@atlassian.com>
atlassian · Mar 25, 2024 · 2e2049f · 2e2049f
1 parent 741fe43
commit 2e2049f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/docs/docs/userguide/upgrades/PRODUCTS_UPGRADE.md b/docs/docs/userguide/upgrades/PRODUCTS_UPGRADE.md
@@ -11,8 +11,8 @@ Go to the Atlassian Docker Hub page of the relevant product to pick a tag that m
 
 !!! note "Atlassian Docker Hub page for supported products:"
     * Jira: [atlassian/jira-software](https://hub.docker.com/r/atlassian/jira-software/tags){.external}
-    * Confluence: [atlassian/confluence-server](https://hub.docker.com/r/atlassian/confluence-server/tags){.external}
-    * Bitbucket: [atlassian/bitbucket-server](https://hub.docker.com/r/atlassian/bitbucket-server/tags){.external}
+    * Confluence: [atlassian/confluence](https://hub.docker.com/r/atlassian/confluence/tags){.external}
+    * Bitbucket: [atlassian/bitbucket](https://hub.docker.com/r/atlassian/bitbucket/tags){.external}
     * Bamboo: [atlassian/bamboo](https://hub.docker.com/r/atlassian/bamboo/tags){.external}
     * Bamboo agent: [atlassian/bamboo-agent-base](https://hub.docker.com/r/atlassian/bamboo-agent-base/tags){.external}
     * Crowd: [atlassian/crowd](https://hub.docker.com/r/atlassian/crowd){.external}
@@ -145,7 +145,7 @@ You can use rolling upgrade only if the target version is zero-downtime compatib
 
         #### 1. Find the tag of the target image.
 
-        Go to [atlassian/confluence-server](https://hub.docker.com/r/atlassian/confluence-server/tags){.external}
+        Go to [atlassian/confluence](https://hub.docker.com/r/atlassian/confluence/tags){.external}
         Docker Hub page to pick a tag that matches your target version.
 
         In the example we're running Confluence using the `7.12.0-jdk11` tag, and we'll be upgrading to `7.12.1-jdk11` - our *target*.
@@ -194,7 +194,7 @@ You can use rolling upgrade only if the target version is zero-downtime compatib
                 [Upgrading Bitbucket with zero downtime](https://confluence.atlassian.com/bitbucketserver/upgrade-bitbucket-without-downtime-1038780379.html){.external}
         #### 1. Find tag of the target image.
 
-        Go to [atlassian/bitbucket-server](https://hub.docker.com/r/atlassian/bitbucket-server/tags){.external}
+        Go to [atlassian/bitbucket](https://hub.docker.com/r/atlassian/bitbucket/tags){.external}
         Docker Hub page to pick a tag that matches your target version.
 
         In the example we're running Bitbucket using the `7.12.0-jdk11` tag, and we'll be upgrading to `7.12.1-jdk11` - our *target*.

diff --git a/src/main/charts/bamboo/README.md b/src/main/charts/bamboo/README.md
@@ -35,7 +35,7 @@ Kubernetes: `>=1.21.x-0`
 | bamboo.accessLog.mountPath | string | `"/opt/atlassian/bamboo/logs"` | The path within the Bamboo container where the local-home volume should be mounted in order to capture access logs.  |
 | bamboo.additionalBundledPlugins | list | `[]` | Specifies a list of additional Bamboo plugins that should be added to the Bamboo container. Note plugins installed via this method will appear as bundled plugins rather than user plugins. These should be specified in the same manner as the 'additionalLibraries' property. Additional details: https://atlassian.github.io/data-center-helm-charts/examples/external_libraries/EXTERNAL_LIBS/  NOTE: only .jar files can be loaded using this approach. OBR's can be extracted (unzipped) to access the associated .jar  An alternative to this method is to install the plugins via "Manage Apps" in the product system administration UI.  |
 | bamboo.additionalCertificates | object | `{"customCmd":null,"secretName":null}` | Certificates to be added to Java truststore. Provide reference to a secret that contains the certificates  |
-| bamboo.additionalEnvironmentVariables | list | `[]` | Defines any additional environment variables to be passed to the Bamboo container. See https://hub.docker.com/r/atlassian/bamboo-server for supported variables.  |
+| bamboo.additionalEnvironmentVariables | list | `[]` | Defines any additional environment variables to be passed to the Bamboo container. See https://hub.docker.com/r/atlassian/bamboo for supported variables.  |
 | bamboo.additionalJvmArgs | list | `[]` | Specifies a list of additional arguments that can be passed to the Bamboo JVM, e.g. system properties.  |
 | bamboo.additionalLibraries | list | `[]` | Specifies a list of additional Java libraries that should be added to the Bamboo container. Each item in the list should specify the name of the volume that contains the library, as well as the name of the library file within that volume's root directory. Optionally, a subDirectory field can be included to specify which directory in the volume contains the library file. Additional details: https://atlassian.github.io/data-center-helm-charts/examples/external_libraries/EXTERNAL_LIBS/  |
 | bamboo.additionalPorts | list | `[]` | Defines any additional ports for the Bamboo container.  |
@@ -126,7 +126,7 @@ Kubernetes: `>=1.21.x-0`
 | fluentd.imageTag | string | `"v1.11.5-debian-elasticsearch7-1.2"` | The Fluentd sidecar image tag  |
 | fluentd.resources | object | `{}` | Resources requests and limits for fluentd sidecar container See: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/  |
 | 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.repository | string | `"atlassian/bamboo"` | The Bamboo Docker image to use https://hub.docker.com/r/atlassian/bamboo  |
 | 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. 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.  |

diff --git a/src/main/charts/bamboo/values.yaml b/src/main/charts/bamboo/values.yaml
@@ -59,7 +59,7 @@ ordinals:
 image:
 
   # -- The Bamboo Docker image to use
-  # https://hub.docker.com/r/atlassian/bamboo-server
+  # https://hub.docker.com/r/atlassian/bamboo
   #
   repository: atlassian/bamboo
 
@@ -929,7 +929,7 @@ bamboo:
   additionalVolumeMounts: []
 
   # -- Defines any additional environment variables to be passed to the Bamboo
-  # container. See https://hub.docker.com/r/atlassian/bamboo-server for
+  # container. See https://hub.docker.com/r/atlassian/bamboo for
   # supported variables.
   #
   additionalEnvironmentVariables: []

diff --git a/src/main/charts/bitbucket/README.md b/src/main/charts/bitbucket/README.md
@@ -34,7 +34,7 @@ Kubernetes: `>=1.21.x-0`
 | atlassianAnalyticsAndSupport.helmValues.enabled | bool | `true` | Mount ConfigMap with selected Helm chart values as a YAML file which can be optionally including to support.zip  |
 | bitbucket.additionalBundledPlugins | list | `[]` | Specifies a list of additional Bitbucket plugins that should be added to the Bitbucket container. Note plugins installed via this method will appear as bundled plugins rather than user plugins. These should be specified in the same manner as the 'additionalLibraries' property. Additional details: https://atlassian.github.io/data-center-helm-charts/examples/external_libraries/EXTERNAL_LIBS/  NOTE: only .jar files can be loaded using this approach. OBR's can be extracted (unzipped) to access the associated .jar  An alternative to this method is to install the plugins via "Manage Apps" in the product system administration UI.  |
 | bitbucket.additionalCertificates | object | `{"customCmd":null,"secretName":null}` | Certificates to be added to Java truststore. Provide reference to a secret that contains the certificates  |
-| bitbucket.additionalEnvironmentVariables | list | `[]` | Defines any additional environment variables to be passed to the Bitbucket container. See https://hub.docker.com/r/atlassian/bitbucket-server for supported variables.  |
+| bitbucket.additionalEnvironmentVariables | list | `[]` | Defines any additional environment variables to be passed to the Bitbucket container. See https://hub.docker.com/r/atlassian/bitbucket for supported variables.  |
 | bitbucket.additionalJvmArgs | list | `[]` | Specifies a list of additional arguments that can be passed to the Bitbucket JVM, e.g. system properties.  |
 | bitbucket.additionalLibraries | list | `[]` | Specifies a list of additional Java libraries that should be added to the Bitbucket container. Each item in the list should specify the name of the volume that contains the library, as well as the name of the library file within that volume's root directory. Optionally, a subDirectory field can be included to specify which directory in the volume contains the library file. Additional details: https://atlassian.github.io/data-center-helm-charts/examples/external_libraries/EXTERNAL_LIBS/  |
 | bitbucket.additionalPorts | list | `[]` | Defines any additional ports for the Bitbucket container.  |
@@ -159,7 +159,7 @@ Kubernetes: `>=1.21.x-0`
 | fluentd.resources | object | `{}` | Resources requests and limits for fluentd sidecar container See: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/  |
 | image | object | `{"pullPolicy":"IfNotPresent","repository":"atlassian/bitbucket","tag":""}` | Image configuration  |
 | 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.repository | string | `"atlassian/bitbucket"` | The Bitbucket Docker image to use https://hub.docker.com/r/atlassian/bitbucket  |
 | 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. 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.  |

diff --git a/src/main/charts/bitbucket/values.yaml b/src/main/charts/bitbucket/values.yaml
@@ -55,7 +55,7 @@ ordinals:
 image:
 
   # -- The Bitbucket Docker image to use
-  # https://hub.docker.com/r/atlassian/bitbucket-server
+  # https://hub.docker.com/r/atlassian/bitbucket
   #
   repository: atlassian/bitbucket
 
@@ -1165,7 +1165,7 @@ bitbucket:
   additionalVolumeMounts: []
 
   # -- Defines any additional environment variables to be passed to the Bitbucket
-  # container. See https://hub.docker.com/r/atlassian/bitbucket-server for
+  # container. See https://hub.docker.com/r/atlassian/bitbucket for
   # supported variables.
   #
   additionalEnvironmentVariables: []

diff --git a/src/main/charts/confluence/README.md b/src/main/charts/confluence/README.md
@@ -37,7 +37,7 @@ Kubernetes: `>=1.21.x-0`
 | confluence.accessLog.mountPath | string | `"/opt/atlassian/confluence/logs"` | The path within the Confluence container where the local-home volume should be mounted in order to capture access logs.  |
 | confluence.additionalBundledPlugins | list | `[]` | Specifies a list of additional Confluence plugins that should be added to the Confluence container. Note plugins installed via this method will appear as bundled plugins rather than user plugins. These should be specified in the same manner as the 'additionalLibraries' property. Additional details: https://atlassian.github.io/data-center-helm-charts/examples/external_libraries/EXTERNAL_LIBS/  NOTE: only .jar files can be loaded using this approach. OBR's can be extracted (unzipped) to access the associated .jar  An alternative to this method is to install the plugins via "Manage Apps" in the product system administration UI.  |
 | confluence.additionalCertificates | object | `{"customCmd":null,"secretName":null}` | Certificates to be added to Java truststore. Provide reference to a secret that contains the certificates  |
-| confluence.additionalEnvironmentVariables | list | `[]` | Defines any additional environment variables to be passed to the Confluence container. See https://hub.docker.com/r/atlassian/confluence-server for supported variables.  |
+| confluence.additionalEnvironmentVariables | list | `[]` | Defines any additional environment variables to be passed to the Confluence container. See https://hub.docker.com/r/atlassian/confluence for supported variables.  |
 | confluence.additionalJvmArgs | list | `[]` | Specifies a list of additional arguments that can be passed to the Confluence JVM, e.g. system properties.  |
 | confluence.additionalLibraries | list | `[]` | Specifies a list of additional Java libraries that should be added to the Confluence container. Each item in the list should specify the name of the volume that contains the library, as well as the name of the library file within that volume's root directory. Optionally, a subDirectory field can be included to specify which directory in the volume contains the library file. Additional details: https://atlassian.github.io/data-center-helm-charts/examples/external_libraries/EXTERNAL_LIBS/  |
 | confluence.additionalPorts | list | `[]` | Defines any additional ports for the Confluence container.  |
@@ -120,7 +120,7 @@ Kubernetes: `>=1.21.x-0`
 | fluentd.imageTag | string | `"v1.11.5-debian-elasticsearch7-1.2"` | The Fluentd sidecar image tag  |
 | fluentd.resources | object | `{}` | Resources requests and limits for fluentd sidecar container See: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/  |
 | 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.repository | string | `"atlassian/confluence"` | The Confluence Docker image to use https://hub.docker.com/r/atlassian/confluence  |
 | 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. 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.  |

diff --git a/src/main/charts/confluence/values.yaml b/src/main/charts/confluence/values.yaml
@@ -47,7 +47,7 @@ ordinals:
 image:
 
   # -- The Confluence Docker image to use
-  # https://hub.docker.com/r/atlassian/confluence-server
+  # https://hub.docker.com/r/atlassian/confluence
   #
   repository: atlassian/confluence
 
@@ -992,7 +992,7 @@ confluence:
   additionalVolumeMounts: []
 
   # -- Defines any additional environment variables to be passed to the Confluence
-  # container. See https://hub.docker.com/r/atlassian/confluence-server for
+  # container. See https://hub.docker.com/r/atlassian/confluence for
   # supported variables.
   #
   additionalEnvironmentVariables: []