From d0fee466c6992203dd4dca0fce6d34d3c06e5ab7 Mon Sep 17 00:00:00 2001 From: Rambabu Bolla Date: Tue, 9 Jul 2024 09:28:15 +0000 Subject: [PATCH 1/3] mage --- kubernetes/cray-sysmgmt-health/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes/cray-sysmgmt-health/values.yaml b/kubernetes/cray-sysmgmt-health/values.yaml index f8f7cb9..5c3f617 100644 --- a/kubernetes/cray-sysmgmt-health/values.yaml +++ b/kubernetes/cray-sysmgmt-health/values.yaml @@ -144,7 +144,7 @@ victoria-metrics-k8s-stack: replicationFactor: 2 vmstorage: image: - repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vmstorage + repository: victoriametrics/vmstorage tag: v1.93.1-cluster replicaCount: 2 resources: @@ -163,7 +163,7 @@ victoria-metrics-k8s-stack: vmselect: image: - repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vmselect + repository: victoriametrics/vmselect tag: v1.93.1-cluster replicaCount: 2 resources: @@ -182,7 +182,7 @@ victoria-metrics-k8s-stack: vminsert: image: - repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vminsert + repository: victoriametrics/vminsert tag: v1.93.1-cluster replicaCount: 2 resources: @@ -197,7 +197,7 @@ victoria-metrics-k8s-stack: enabled: true spec: image: - repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vmalert + repository: victoriametrics/vmalert tag: v1.93.1 vmagent: @@ -205,7 +205,7 @@ victoria-metrics-k8s-stack: spec: selectAllByDefault: true image: - repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vmagent + repository: victoriametrics/vmagent tag: v1.93.1 secrets: - etcd-client-cert From c554ff12f747e019e61a841ccd2d06007f31fd0e Mon Sep 17 00:00:00 2001 From: Rambabu Bolla Date: Wed, 10 Jul 2024 05:21:14 +0000 Subject: [PATCH 2/3] revert --- kubernetes/cray-sysmgmt-health/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes/cray-sysmgmt-health/values.yaml b/kubernetes/cray-sysmgmt-health/values.yaml index 5c3f617..f8f7cb9 100644 --- a/kubernetes/cray-sysmgmt-health/values.yaml +++ b/kubernetes/cray-sysmgmt-health/values.yaml @@ -144,7 +144,7 @@ victoria-metrics-k8s-stack: replicationFactor: 2 vmstorage: image: - repository: victoriametrics/vmstorage + repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vmstorage tag: v1.93.1-cluster replicaCount: 2 resources: @@ -163,7 +163,7 @@ victoria-metrics-k8s-stack: vmselect: image: - repository: victoriametrics/vmselect + repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vmselect tag: v1.93.1-cluster replicaCount: 2 resources: @@ -182,7 +182,7 @@ victoria-metrics-k8s-stack: vminsert: image: - repository: victoriametrics/vminsert + repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vminsert tag: v1.93.1-cluster replicaCount: 2 resources: @@ -197,7 +197,7 @@ victoria-metrics-k8s-stack: enabled: true spec: image: - repository: victoriametrics/vmalert + repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vmalert tag: v1.93.1 vmagent: @@ -205,7 +205,7 @@ victoria-metrics-k8s-stack: spec: selectAllByDefault: true image: - repository: victoriametrics/vmagent + repository: artifactory.algol60.net/csm-docker/stable/docker.io/victoriametrics/vmagent tag: v1.93.1 secrets: - etcd-client-cert From d68d061d62d80e3195f920a47e6f66e14827c806 Mon Sep 17 00:00:00 2001 From: Rambabu Bolla Date: Wed, 10 Jul 2024 07:00:36 +0000 Subject: [PATCH 3/3] CASMMON-401: CSM build fix --- kubernetes/cray-sysmgmt-health/Chart.yaml | 2 +- kubernetes/cray-sysmgmt-health/templates/_helpers.tpl | 2 +- kubernetes/cray-sysmgmt-health/values.yaml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kubernetes/cray-sysmgmt-health/Chart.yaml b/kubernetes/cray-sysmgmt-health/Chart.yaml index 6e68b6d..3c09ee3 100644 --- a/kubernetes/cray-sysmgmt-health/Chart.yaml +++ b/kubernetes/cray-sysmgmt-health/Chart.yaml @@ -23,7 +23,7 @@ # apiVersion: v2 name: cray-sysmgmt-health -version: 0.30.1 +version: 0.30.2 description: An extension of the official prometheus-operator helm chart for monitoring system health. keywords: diff --git a/kubernetes/cray-sysmgmt-health/templates/_helpers.tpl b/kubernetes/cray-sysmgmt-health/templates/_helpers.tpl index ea7f52d..7697e4b 100644 --- a/kubernetes/cray-sysmgmt-health/templates/_helpers.tpl +++ b/kubernetes/cray-sysmgmt-health/templates/_helpers.tpl @@ -90,7 +90,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end -}} {{- define "cray-sysmgmt-health.prometheus-snmp-exporter.selectorLabels" }} -app.kubernetes.io/name: {{ include "cray-sysmgmt-health.prometheus-snmp-exporter.fullname" . }} +app.kubernetes.io/name: prometheus-snmp-exporter app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} diff --git a/kubernetes/cray-sysmgmt-health/values.yaml b/kubernetes/cray-sysmgmt-health/values.yaml index f8f7cb9..a9b75e9 100644 --- a/kubernetes/cray-sysmgmt-health/values.yaml +++ b/kubernetes/cray-sysmgmt-health/values.yaml @@ -122,9 +122,9 @@ victoria-metrics-k8s-stack: pullPolicy: IfNotPresent env: - name: VM_VMAGENTDEFAULT_CONFIGRELOADIMAGE - value: arti.hpc.amslabs.hpecorp.net/csm-docker-remote/stable/docker.io/prom/prometheus-config-reloader:v0.62.0 + value: artifactory.algol60.net/csm-docker/stable/docker.io/prom/prometheus-config-reloader:v0.62.0 - name: VM_VMALERTDEFAULT_CONFIGRELOADIMAGE - value: arti.hpc.amslabs.hpecorp.net/csm-docker-remote/stable/docker.io/jimmidyson/configmap-reload:v0.3.0 + value: artifactory.algol60.net/csm-docker/stable/docker.io/jimmidyson/configmap-reload:v0.3.0 # -- Tells helm to remove CRD after chart remove cleanupCRD: true cleanupImage: @@ -302,7 +302,7 @@ victoria-metrics-k8s-stack: tag: v0.25.0 containers: - name: config-reloader - image: arti.hpc.amslabs.hpecorp.net/csm-docker-remote/stable/docker.io/jimmidyson/configmap-reload:v0.3.0 + image: artifactory.algol60.net/csm-docker/stable/docker.io/jimmidyson/configmap-reload:v0.3.0 retention: 48h logLevel: debug replicaCount: 2 @@ -415,8 +415,8 @@ victoria-metrics-k8s-stack: isDefault: true testFramework: - image: - repository: artifactory.algol60.net/csm-docker/stable/docker.io/bats/bats + image: artifactory.algol60.net/csm-docker/stable/docker.io/bats/bats + tag: v1.4.1 # Exporters kubelet: