From 56d2acd75ff599520e119f788d867f600d18b142 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Fri, 17 Nov 2023 05:18:43 -0500 Subject: [PATCH] chore(repo) change dependency charts to the upstream images (#14738) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Update the dependency train charts to their direct upstream image. ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ Signed-off-by: Kjeld Schouten Co-authored-by: Kjeld Schouten --- charts/dependency/clickhouse/Chart.yaml | 2 +- charts/dependency/clickhouse/values.yaml | 13 +------ .../dependency/kube-state-metrics/Chart.yaml | 2 +- .../dependency/kube-state-metrics/values.yaml | 37 +++++++------------ charts/dependency/mariadb/Chart.yaml | 2 +- charts/dependency/mariadb/values.yaml | 13 +------ charts/dependency/memcached/Chart.yaml | 2 +- charts/dependency/memcached/values.yaml | 7 +--- charts/dependency/mongodb/values.yaml | 15 +------- charts/dependency/node-exporter/Chart.yaml | 2 +- charts/dependency/node-exporter/values.yaml | 33 ++++++----------- charts/dependency/redis/Chart.yaml | 2 +- charts/dependency/redis/values.yaml | 14 +------ charts/dependency/solr/Chart.yaml | 2 +- charts/dependency/solr/values.yaml | 15 +------- 15 files changed, 44 insertions(+), 117 deletions(-) diff --git a/charts/dependency/clickhouse/Chart.yaml b/charts/dependency/clickhouse/Chart.yaml index 83c0184e82d..5db1dc40471 100644 --- a/charts/dependency/clickhouse/Chart.yaml +++ b/charts/dependency/clickhouse/Chart.yaml @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/dependency/clickhouse - https://clickhouse.com/ type: application -version: 7.0.27 +version: 7.0.28 annotations: truecharts.org/category: database truecharts.org/SCALE-support: "true" diff --git a/charts/dependency/clickhouse/values.yaml b/charts/dependency/clickhouse/values.yaml index 826bf21dde1..b69b2cc4cf0 100644 --- a/charts/dependency/clickhouse/values.yaml +++ b/charts/dependency/clickhouse/values.yaml @@ -1,8 +1,7 @@ image: - repository: tccr.io/truecharts/clickhouse + repository: clickhouse/clickhouse-server pullPolicy: IfNotPresent - tag: v23.10.3.5@sha256:5cb314fb7c85b4c28f6d91cc26d15c7f1b6ac3429670377816e45c0e13f5876f - + tag: 23.10.3.5@sha256:7361beec1aac01e832fc701f92de57941d7a9bcdc6219d9527b961595ca7856b workload: main: replicas: 1 @@ -28,7 +27,6 @@ workload: startup: type: http path: /ping - securityContext: container: readOnlyRootFilesystem: false @@ -41,7 +39,6 @@ securityContext: # - IPC_LOCK # - NET_ADMIN # - SYS_NICE - service: main: ports: @@ -49,30 +46,24 @@ service: port: 8123 protocol: http targetPort: 8123 - persistence: data: enabled: true mountPath: /var/lib/clickhouse - clickhouseDatabase: "test" clickhouseUsername: "test" clickhouseDefaultAccessManagement: 0 - # -- Secret or password # One of these options is required, unless used as a dependency for another TrueCharts chart. clickhousePassword: "" existingSecret: "" - secret: credentials: enabled: true data: clickhouse-password: '{{ ( .Values.clickhousePassword | default "empty" ) }}' - portal: open: enabled: false - manifestManager: enabled: false diff --git a/charts/dependency/kube-state-metrics/Chart.yaml b/charts/dependency/kube-state-metrics/Chart.yaml index 5d5d6ae6d7e..e48ebf97a51 100644 --- a/charts/dependency/kube-state-metrics/Chart.yaml +++ b/charts/dependency/kube-state-metrics/Chart.yaml @@ -21,7 +21,7 @@ name: kube-state-metrics sources: - https://github.com/truecharts/charts/tree/master/charts/dependency/kube-state-metrics type: application -version: 3.0.40 +version: 3.0.41 annotations: truecharts.org/category: metrics truecharts.org/SCALE-support: "true" diff --git a/charts/dependency/kube-state-metrics/values.yaml b/charts/dependency/kube-state-metrics/values.yaml index 247855cdbc5..8614bee45c2 100644 --- a/charts/dependency/kube-state-metrics/values.yaml +++ b/charts/dependency/kube-state-metrics/values.yaml @@ -1,8 +1,7 @@ image: - repository: tccr.io/truecharts/kube-state-metrics + repository: bitnami/kube-state-metrics pullPolicy: IfNotPresent - tag: v2.10.1@sha256:530be32074f4810085dbc6473ea9383e31b00f5c3337da5a4011a5c91ee71b71 - + tag: 2.10.1@sha256:6819ee084fdb0ddee851ffcda90833d4e5b991987bdd1fbe4804ade61f47ccdb service: main: ports: @@ -16,7 +15,6 @@ service: enabled: true protocol: http port: 8081 - workload: main: podSpec: @@ -51,28 +49,22 @@ workload: # - --resources=verticalpodautoscalers - --resources=validatingwebhookconfigurations - --resources=volumeattachments - probes: liveness: path: /healthz port: main - readiness: path: /healthz port: main - startup: type: tcp port: main - podOptions: automountServiceAccountToken: true - serviceAccount: main: enabled: true primary: true - rbac: main: enabled: true @@ -281,9 +273,8 @@ rbac: - watch - apiGroups: ["discovery.k8s.io"] resources: - - endpointslices + - endpointslices verbs: ["list", "watch"] - metrics: main: # -- Enable and configure a Prometheus serviceMonitor for the chart under this key. @@ -300,18 +291,16 @@ metrics: labels: {} # -- Configure additionial rules for the chart under this key. # @default -- See prometheusrules.yaml - rules: - [] - # - alert: UnifiPollerAbsent - # annotations: - # description: Unifi Poller has disappeared from Prometheus service discovery. - # summary: Unifi Poller is down. - # expr: | - # absent(up{job=~".*unifi-poller.*"} == 1) - # for: 5m - # labels: - # severity: critical - + rules: [] + # - alert: UnifiPollerAbsent + # annotations: + # description: Unifi Poller has disappeared from Prometheus service discovery. + # summary: Unifi Poller is down. + # expr: | + # absent(up{job=~".*unifi-poller.*"} == 1) + # for: 5m + # labels: + # severity: critical portal: open: enabled: false diff --git a/charts/dependency/mariadb/Chart.yaml b/charts/dependency/mariadb/Chart.yaml index 91501ec9eda..988d64ef461 100644 --- a/charts/dependency/mariadb/Chart.yaml +++ b/charts/dependency/mariadb/Chart.yaml @@ -25,7 +25,7 @@ sources: - https://github.com/prometheus/mysqld_exporter - https://mariadb.org type: application -version: 9.0.42 +version: 9.0.43 annotations: truecharts.org/category: database truecharts.org/SCALE-support: "true" diff --git a/charts/dependency/mariadb/values.yaml b/charts/dependency/mariadb/values.yaml index b3fed70e917..c9e0dff9ba5 100644 --- a/charts/dependency/mariadb/values.yaml +++ b/charts/dependency/mariadb/values.yaml @@ -1,8 +1,7 @@ image: - repository: tccr.io/truecharts/mariadb + repository: bitnami/mariadb pullPolicy: IfNotPresent - tag: v11.1.3@sha256:18e6da279a02195276246aaf985fabde46bd2a58051fc4e7ee65e1c986e7a717 - + tag: 11.1.3@sha256:ec252de855742584bb2dace25f5cd83ccfdde4f61961cca00fc29a1d5200c2aa workload: main: podSpec: @@ -43,43 +42,35 @@ workload: - /bin/bash - -ec - "until /opt/bitnami/scripts/mariadb/healthcheck.sh; do sleep 2; done" - service: main: ports: main: port: 3306 targetPort: 3306 - securityContext: container: readOnlyRootFilesystem: false runAsGroup: 0 - secret: credentials: enabled: true data: mariadb-password: '{{ ( .Values.mariadbPassword | default "empty" ) }}' mariadb-root-password: '{{ ( .Values.mariadbRootPassword | default "empty" ) }}' - persistence: data: enabled: true mountPath: "/bitnami/mariadb" - mariadbUsername: "test" mariadbDatabase: "test" mariadbRootPassword: "testroot" - # -- Secret or password # One of these options is required, unless used as a dependency for another TrueCharts chart. mariadbPassword: "" existingSecret: "" - portal: open: enabled: false - manifestManager: enabled: false diff --git a/charts/dependency/memcached/Chart.yaml b/charts/dependency/memcached/Chart.yaml index 500ed08f07f..4d667f57349 100644 --- a/charts/dependency/memcached/Chart.yaml +++ b/charts/dependency/memcached/Chart.yaml @@ -23,7 +23,7 @@ sources: - https://github.com/bitnami/bitnami-docker-memcached - http://memcached.org/ type: application -version: 8.0.43 +version: 8.0.44 annotations: truecharts.org/category: database truecharts.org/SCALE-support: "true" diff --git a/charts/dependency/memcached/values.yaml b/charts/dependency/memcached/values.yaml index 31aa05765fc..b81d56b8a23 100644 --- a/charts/dependency/memcached/values.yaml +++ b/charts/dependency/memcached/values.yaml @@ -1,8 +1,7 @@ image: - repository: tccr.io/truecharts/memcached + repository: bitnami/memcached pullPolicy: IfNotPresent - tag: v1.6.22@sha256:eb17227cee8bfa3ae63ba3e89b628d119b9d28c3cbba6004ef2c361cebfe8e28 - + tag: 1.6.22@sha256:d4c4ba01c45b2fdbc58cbb94af8ed0690c46ce2c70b34de49751c8920042af02 service: main: ports: @@ -10,10 +9,8 @@ service: port: 11211 protocol: tcp targetPort: 11211 - portal: open: enabled: false - manifestManager: enabled: false diff --git a/charts/dependency/mongodb/values.yaml b/charts/dependency/mongodb/values.yaml index 98759cdbe78..b8226b43cd9 100644 --- a/charts/dependency/mongodb/values.yaml +++ b/charts/dependency/mongodb/values.yaml @@ -1,8 +1,7 @@ image: - repository: tccr.io/truecharts/mongodb + repository: bitnami/mongodb pullPolicy: IfNotPresent - tag: v7.0.3@sha256:b1f2af7d594e23158886e6b4f279b34491f261e9d26d7a370ad36950214f04de - + tag: 7.0.3@sha256:a7e4de9a179ed97842c5f7345ac47644606b94f37487ae1b49c7cc275cab5383 workload: main: replicas: 1 @@ -42,7 +41,6 @@ workload: - /bin/bash - -ec - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet - # -- Redainess probe configuration # @default -- See below readiness: @@ -59,7 +57,6 @@ workload: - /bin/bash - -ec - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet - # -- Startup probe configuration # @default -- See below startup: @@ -75,43 +72,35 @@ workload: - /bin/bash - -ec - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet - service: main: ports: main: port: 27017 targetPort: 27017 - securityContext: container: runAsGroup: 0 readOnlyRootFilesystem: false - persistence: data: enabled: true mountPath: "/bitnami/mongodb" - mongodbUsername: "test" mongodbDatabase: "test" mongodbRootPassword: "testroot" - # -- Secret or password # One of these options is required, unless used as a dependency for another TrueCharts chart. mongodbPassword: "" existingSecret: "" - secret: credentials: enabled: true data: mongodb-password: '{{ ( .Values.mongodbPassword | default "empty" ) }}' mongodb-root-password: '{{ ( .Values.mongodbRootPassword | default "empty" ) }}' - portal: open: enabled: false - manifestManager: enabled: false diff --git a/charts/dependency/node-exporter/Chart.yaml b/charts/dependency/node-exporter/Chart.yaml index c6395bfdcef..4ec684fc511 100644 --- a/charts/dependency/node-exporter/Chart.yaml +++ b/charts/dependency/node-exporter/Chart.yaml @@ -21,7 +21,7 @@ name: node-exporter sources: - https://github.com/truecharts/charts/tree/master/charts/dependency/node-exporter type: application -version: 3.0.42 +version: 3.0.43 annotations: truecharts.org/category: metrics truecharts.org/SCALE-support: "true" diff --git a/charts/dependency/node-exporter/values.yaml b/charts/dependency/node-exporter/values.yaml index ea7f5383eb6..04512936141 100644 --- a/charts/dependency/node-exporter/values.yaml +++ b/charts/dependency/node-exporter/values.yaml @@ -1,15 +1,13 @@ image: - repository: tccr.io/truecharts/node-exporter + repository: bitnami/node-exporter pullPolicy: IfNotPresent - tag: v1.7.0@sha256:a9ff702f0d7de85ba46707493b4fd46d37ae45e34611dcc296345bb410882553 - + tag: 1.7.0@sha256:68d9e82bc1c876bdf78bc6a81965f1f32344087dd56bbec052acac8237d86cf8 service: main: ports: main: protocol: http port: 9910 - workload: main: type: DaemonSet @@ -29,19 +27,15 @@ workload: liveness: path: / port: main - readiness: path: / port: main - startup: type: tcp port: main - podOptions: hostNetwork: true hostPID: true - persistence: host: enabled: true @@ -61,7 +55,6 @@ persistence: hostPath: /sys mountPath: /hostsys readOnly: true - metrics: main: # -- Enable and configure a Prometheus serviceMonitor for the chart under this key. @@ -78,18 +71,16 @@ metrics: labels: {} # -- Configure additionial rules for the chart under this key. # @default -- See prometheusrules.yaml - rules: - [] - # - alert: UnifiPollerAbsent - # annotations: - # description: Unifi Poller has disappeared from Prometheus service discovery. - # summary: Unifi Poller is down. - # expr: | - # absent(up{job=~".*unifi-poller.*"} == 1) - # for: 5m - # labels: - # severity: critical - + rules: [] + # - alert: UnifiPollerAbsent + # annotations: + # description: Unifi Poller has disappeared from Prometheus service discovery. + # summary: Unifi Poller is down. + # expr: | + # absent(up{job=~".*unifi-poller.*"} == 1) + # for: 5m + # labels: + # severity: critical portal: open: enabled: false diff --git a/charts/dependency/redis/Chart.yaml b/charts/dependency/redis/Chart.yaml index ae7280223ac..c231fe80b85 100644 --- a/charts/dependency/redis/Chart.yaml +++ b/charts/dependency/redis/Chart.yaml @@ -23,7 +23,7 @@ sources: - https://github.com/bitnami/bitnami-docker-redis - http://redis.io/ type: application -version: 8.0.46 +version: 8.0.47 annotations: truecharts.org/category: database truecharts.org/SCALE-support: "true" diff --git a/charts/dependency/redis/values.yaml b/charts/dependency/redis/values.yaml index 46d9255f7a2..65216c7df6b 100644 --- a/charts/dependency/redis/values.yaml +++ b/charts/dependency/redis/values.yaml @@ -1,8 +1,7 @@ image: - repository: tccr.io/truecharts/redis + repository: bitnami/redis pullPolicy: IfNotPresent - tag: v7.2.3@sha256:583d852032f7537c271db380ed3f500de8ece51b66ac6315b66dd195bed28740 - + tag: 7.2.3@sha256:f7db3a51e2726109819b50004c3bbf8f1c792723af274f88532b8c3e64fcde0b workload: main: replicas: 1 @@ -45,12 +44,10 @@ workload: - sh - -c - /health/ping_readiness_local.sh 2 - securityContext: container: readOnlyRootFilesystem: false runAsGroup: 0 - configmap: health: enabled: true @@ -123,30 +120,25 @@ configmap: "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? exit $exit_status - secret: credentials: enabled: true data: redis-password: '{{ ( .Values.redisPassword | default "nothing" ) }}' - # -- Secret or password # One of these options is required, unless used as a dependency for another TrueCharts chart. redisPassword: "" existingSecret: "" - service: main: ports: main: port: 6379 targetPort: 6379 - volumeClaimTemplates: data: enabled: true mountPath: "/bitnami/redis" - persistence: redis-health: enabled: true @@ -167,10 +159,8 @@ persistence: path: ping_liveness_local_and_master.sh - key: ping_readiness_local_and_master.sh path: ping_readiness_local_and_master.sh - portal: open: enabled: false - manifestManager: enabled: false diff --git a/charts/dependency/solr/Chart.yaml b/charts/dependency/solr/Chart.yaml index f22b35e2b79..9ad4cd0bfb4 100644 --- a/charts/dependency/solr/Chart.yaml +++ b/charts/dependency/solr/Chart.yaml @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/dependency/solr - https://github.com/apache/solr type: application -version: 6.0.43 +version: 6.0.44 annotations: truecharts.org/category: search truecharts.org/SCALE-support: "true" diff --git a/charts/dependency/solr/values.yaml b/charts/dependency/solr/values.yaml index 1fcfaef8cc7..d9143deebc6 100644 --- a/charts/dependency/solr/values.yaml +++ b/charts/dependency/solr/values.yaml @@ -1,8 +1,7 @@ image: - repository: tccr.io/truecharts/solr + repository: bitnami/solr pullPolicy: IfNotPresent - tag: v9.4.0@sha256:5decbd701a699c7e7eb76f12bb1115db06fdb5aae1d16ac54a1ae6a7b7157b6a - + tag: 9.4.0@sha256:9a30d8e5ec3ba147325008ec0734e52e578904a7ac4eefa6127e936aadba9544 workload: main: replicas: 1 @@ -19,7 +18,6 @@ workload: expandObjectName: "{{ if .Values.solrPassword }}true{{ else }}false{{ end }}" name: '{{ if .Values.solrPassword }}credentials{{ else if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ printf "%s-%s" .Release.Name "solrcreds" }}{{ end }}' key: "solr-password" - # -- Probe configuration # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) # @default -- See below @@ -45,7 +43,6 @@ workload: else until curl --fail localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done fi; - # -- Redainess probe configuration # @default -- See below readiness: @@ -87,47 +84,39 @@ workload: else until curl --fail localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done fi; - securityContext: container: runAsNonRoot: false readOnlyRootFilesystem: false runAsUser: 1001 runAsGroup: 0 - service: main: ports: main: port: 8983 targetPort: 8983 - persistence: db: enabled: true mountPath: "/bitnami/solr" - # Currently only single core is supported, with multiple cores, probes will fail. solrCores: "testcore" solrEnableAuthentication: "yes" solrUsername: "test" # Used to pass a comma separated list of optional options like '-XX:G1HeapRegionSize=8m' solrOpts: "" - # -- Secret or password # One of these options is required, unless used as a dependency for another TrueCharts chart. existingSecret: "" solrPassword: "" - secret: credentials: enabled: true data: solr-password: '{{ ( .Values.solrPassword | default "empty" ) }}' - portal: open: enabled: true - manifestManager: enabled: false