Skip to content

Commit 18af44e

Browse files
authored
fix: Update Bitnami image references due to deprecation notice (#1037)
* temporary fix for bitnami migration * temporary fix for bitnami migration * temporary fix for bitnami migration * test * pointing to bitnami legacy * pointing to bitnami legacy * pointing to bitnami legacy * pointing to bitnami legacy
1 parent 82f4f42 commit 18af44e

File tree

18 files changed

+38
-51
lines changed

18 files changed

+38
-51
lines changed

docs/docs/userguide/OPERATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ When `monitoring.exposeJmxMetrics` is enabled, [JMX exporter](https://github.com
88
[JMX exporter jar](https://github.com/prometheus/jmx_exporter){.external} isn't available in products dependencies or container images, that is why when `monitoring.exposeJmxMetrics`
99
is enabled there are 2 ways to get it:
1010

11-
* copy from an init container ([bitnami/jmx-exporter DockerHub image](https://hub.docker.com/r/bitnami/jmx-exporter){.external}) - the **default** option in values.yaml which works out of the box
11+
* copy from an init container ([bitnamilegacy/jmx-exporter DockerHub image](https://hub.docker.com/r/bitnamilegacy/jmx-exporter){.external}) - the **default** option in values.yaml which works out of the box
1212
* manually download from [JMX exporter GitHub releases page](https://github.com/prometheus/jmx_exporter/tags){.external} and copy to shared-home or mount as a secret
1313

1414

src/main/charts/bamboo/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@ Kubernetes: `>=1.21.x-0`
159159
| monitoring.grafana.dashboardLabels | object | `{}` | Label selector for Grafana dashboard importer sidecar |
160160
| monitoring.jmxExporterCustomConfig | object | `{}` | Custom JMX config with the rules |
161161
| monitoring.jmxExporterCustomJarLocation | string | `nil` | Location of jmx_exporter jar file if mounted from a secret or manually copied to shared home |
162-
| monitoring.jmxExporterImageRepo | string | `"bitnami/jmx-exporter"` | Image repository with jmx_exporter jar |
162+
| monitoring.jmxExporterImageRepo | string | `"bitnamilegacy/jmx-exporter"` | Image repository with jmx_exporter jar (temporary solution, will be replaced with Maven Central download) |
163163
| monitoring.jmxExporterImageTag | string | `"0.18.0"` | Image tag to be used to pull jmxExporterImageRepo |
164164
| monitoring.jmxExporterInitContainer | object | `{"customSecurityContext":{},"jmxJarLocation":null,"resources":{},"runAsRoot":true}` | JMX exporter init container configuration |
165165
| monitoring.jmxExporterInitContainer.customSecurityContext | object | `{}` | Custom SecurityContext for the jmx exporter init container |
166-
| monitoring.jmxExporterInitContainer.jmxJarLocation | string | `nil` | The location of the JMX exporter jarfile in the JMX exporter image Leave blank for default bitnami image |
166+
| monitoring.jmxExporterInitContainer.jmxJarLocation | string | `nil` | The location of the JMX exporter jarfile in the JMX exporter image. Leave blank for default bitnamilegacy image (temporary solution) |
167167
| monitoring.jmxExporterInitContainer.resources | object | `{}` | Resources requests and limits for the JMX exporter init container See: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
168168
| monitoring.jmxExporterInitContainer.runAsRoot | bool | `true` | Whether to run JMX exporter init container as root to copy JMX exporter binary to shared home volume. Set to false if running containers as root is not allowed in the cluster. |
169169
| monitoring.jmxExporterPort | int | `9999` | Port number on which metrics will be available |

src/main/charts/bamboo/values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,12 +1086,11 @@ monitoring:
10861086

10871087
# -- Image repository with jmx_exporter jar
10881088
#
1089-
jmxExporterImageRepo: bitnami/jmx-exporter
1090-
1091-
# -- Image tag to be used to pull jmxExporterImageRepo
1092-
#
1089+
jmxExporterImageRepo: bitnamilegacy/jmx-exporter
10931090
jmxExporterImageTag: 0.18.0
10941091

1092+
1093+
10951094
# -- Port number on which metrics will be available
10961095
#
10971096
jmxExporterPort: 9999

src/main/charts/bitbucket/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ Kubernetes: `>=1.21.x-0`
202202
| monitoring.grafana.dashboardLabels | object | `{}` | Label selector for Grafana dashboard importer sidecar |
203203
| monitoring.jmxExporterCustomConfig | object | `{}` | Custom JMX config with the rules |
204204
| monitoring.jmxExporterCustomJarLocation | string | `nil` | Location of jmx_exporter jar file if mounted from a secret or manually copied to shared home |
205-
| monitoring.jmxExporterImageRepo | string | `"bitnami/jmx-exporter"` | Image repository with jmx_exporter jar |
205+
| monitoring.jmxExporterImageRepo | string | `"bitnamilegacy/jmx-exporter"` | Image repository with jmx_exporter jar (temporary solution, will be replaced with Maven Central download) |
206206
| monitoring.jmxExporterImageTag | string | `"0.18.0"` | Image tag to be used to pull jmxExporterImageRepo |
207207
| monitoring.jmxExporterInitContainer | object | `{"customSecurityContext":{},"jmxJarLocation":null,"resources":{},"runAsRoot":true}` | JMX exporter init container configuration |
208208
| monitoring.jmxExporterInitContainer.customSecurityContext | object | `{}` | Custom SecurityContext for the jmx exporter init container |
209-
| monitoring.jmxExporterInitContainer.jmxJarLocation | string | `nil` | The location of the JMX exporter jarfile in the JMX exporter image Leave blank for default bitnami image |
209+
| monitoring.jmxExporterInitContainer.jmxJarLocation | string | `nil` | The location of the JMX exporter jarfile in the JMX exporter image. Leave blank for default bitnamilegacy image (temporary solution) |
210210
| monitoring.jmxExporterInitContainer.resources | object | `{}` | Resources requests and limits for the JMX exporter init container See: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
211211
| monitoring.jmxExporterInitContainer.runAsRoot | bool | `true` | Whether to run JMX exporter init container as root to copy JMX exporter binary to shared home volume. Set to false if running containers as root is not allowed in the cluster. |
212212
| monitoring.jmxExporterPort | int | `9999` | Port number on which metrics will be available |

src/main/charts/bitbucket/values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,12 +1352,11 @@ monitoring:
13521352

13531353
# -- Image repository with jmx_exporter jar
13541354
#
1355-
jmxExporterImageRepo: bitnami/jmx-exporter
1356-
1357-
# -- Image tag to be used to pull jmxExporterImageRepo
1358-
#
1355+
jmxExporterImageRepo: bitnamilegacy/jmx-exporter
13591356
jmxExporterImageTag: 0.18.0
13601357

1358+
1359+
13611360
# -- Port number on which metrics will be available
13621361
#
13631362
jmxExporterPort: 9999

src/main/charts/confluence/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Kubernetes: `>=1.21.x-0`
157157
| monitoring.grafana.dashboardLabels | object | `{}` | Label selector for Grafana dashboard importer sidecar |
158158
| monitoring.jmxExporterCustomConfig | object | `{}` | Custom JMX config with the rules |
159159
| monitoring.jmxExporterCustomJarLocation | string | `nil` | Location of jmx_exporter jar file if mounted from a secret or manually copied to shared home |
160-
| monitoring.jmxExporterImageRepo | string | `"bitnami/jmx-exporter"` | Image repository with jmx_exporter jar |
160+
| monitoring.jmxExporterImageRepo | string | `"bitnamilegacy/jmx-exporter"` | Image repository with jmx_exporter jar (temporary solution, will be replaced with Maven Central download) |
161161
| monitoring.jmxExporterImageTag | string | `"0.18.0"` | Image tag to be used to pull jmxExporterImageRepo |
162162
| monitoring.jmxExporterInitContainer | object | `{"customSecurityContext":{},"jmxJarLocation":null,"resources":{},"runAsRoot":true}` | JMX exporter init container configuration |
163163
| monitoring.jmxExporterInitContainer.customSecurityContext | object | `{}` | Custom SecurityContext for the jmx exporter init container |

src/main/charts/confluence/values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,12 +1185,11 @@ monitoring:
11851185

11861186
# -- Image repository with jmx_exporter jar
11871187
#
1188-
jmxExporterImageRepo: bitnami/jmx-exporter
1189-
1190-
# -- Image tag to be used to pull jmxExporterImageRepo
1191-
#
1188+
jmxExporterImageRepo: bitnamilegacy/jmx-exporter
11921189
jmxExporterImageTag: 0.18.0
11931190

1191+
1192+
11941193
# -- Port number on which metrics will be available
11951194
#
11961195
jmxExporterPort: 9999

src/main/charts/crowd/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ Kubernetes: `>=1.21.x-0`
147147
| monitoring.grafana.dashboardLabels | object | `{}` | Label selector for Grafana dashboard importer sidecar |
148148
| monitoring.jmxExporterCustomConfig | object | `{}` | Custom JMX config with the rules |
149149
| monitoring.jmxExporterCustomJarLocation | string | `nil` | Location of jmx_exporter jar file if mounted from a secret or manually copied to shared home |
150-
| monitoring.jmxExporterImageRepo | string | `"bitnami/jmx-exporter"` | Image repository with jmx_exporter jar |
150+
| monitoring.jmxExporterImageRepo | string | `"bitnamilegacy/jmx-exporter"` | Image repository with jmx_exporter jar (temporary solution, will be replaced with Maven Central download) |
151151
| monitoring.jmxExporterImageTag | string | `"0.18.0"` | Image tag to be used to pull jmxExporterImageRepo |
152152
| monitoring.jmxExporterInitContainer | object | `{"customSecurityContext":{},"jmxJarLocation":null,"resources":{},"runAsRoot":true}` | JMX exporter init container configuration |
153153
| monitoring.jmxExporterInitContainer.customSecurityContext | object | `{}` | Custom SecurityContext for the jmx exporter init container |
154-
| monitoring.jmxExporterInitContainer.jmxJarLocation | string | `nil` | The location of the JMX exporter jarfile in the JMX exporter image Leave blank for default bitnami image |
154+
| monitoring.jmxExporterInitContainer.jmxJarLocation | string | `nil` | The location of the JMX exporter jarfile in the JMX exporter image. Leave blank for default bitnamilegacy image (temporary solution) |
155155
| monitoring.jmxExporterInitContainer.resources | object | `{}` | Resources requests and limits for the JMX exporter init container See: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
156156
| monitoring.jmxExporterInitContainer.runAsRoot | bool | `true` | Whether to run JMX exporter init container as root to copy JMX exporter binary to shared home volume. Set to false if running containers as root is not allowed in the cluster. |
157157
| monitoring.jmxExporterPort | int | `9999` | Port number on which metrics will be available |

src/main/charts/crowd/values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,12 +1039,11 @@ monitoring:
10391039

10401040
# -- Image repository with jmx_exporter jar
10411041
#
1042-
jmxExporterImageRepo: bitnami/jmx-exporter
1043-
1044-
# -- Image tag to be used to pull jmxExporterImageRepo
1045-
#
1042+
jmxExporterImageRepo: bitnamilegacy/jmx-exporter
10461043
jmxExporterImageTag: 0.18.0
10471044

1045+
1046+
10481047
# -- Port number on which metrics will be available
10491048
#
10501049
jmxExporterPort: 9999

src/main/charts/jira/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Kubernetes: `>=1.21.x-0`
154154
| monitoring.grafana.dashboardLabels | object | `{}` | Label selector for Grafana dashboard importer sidecar |
155155
| monitoring.jmxExporterCustomConfig | object | `{}` | Custom JMX config with the rules |
156156
| monitoring.jmxExporterCustomJarLocation | string | `nil` | Location of jmx_exporter jar file if mounted from a secret or manually copied to shared home |
157-
| monitoring.jmxExporterImageRepo | string | `"bitnami/jmx-exporter"` | Image repository with jmx_exporter jar |
157+
| monitoring.jmxExporterImageRepo | string | `"bitnamilegacy/jmx-exporter"` | Image repository with jmx_exporter jar (temporary solution, will be replaced with Maven Central download) |
158158
| monitoring.jmxExporterImageTag | string | `"0.18.0"` | Image tag to be used to pull jmxExporterImageRepo |
159159
| monitoring.jmxExporterInitContainer | object | `{"customSecurityContext":{},"jmxJarLocation":null,"resources":{},"runAsRoot":true}` | JMX exporter init container configuration |
160160
| monitoring.jmxExporterInitContainer.customSecurityContext | object | `{}` | Custom SecurityContext for the jmx exporter init container |

0 commit comments

Comments
 (0)