From 36e45cbc84d81b036dd12a626c013e7ffe20dcbb Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Wed, 20 Dec 2023 12:01:09 +0100 Subject: [PATCH 1/4] Update default registry domain in values.yaml --- .../charts/prometheus-agent/values.yaml | 34 +++++++-------- helm/prometheus-agent/values.yaml | 42 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/helm/prometheus-agent/charts/prometheus-agent/values.yaml b/helm/prometheus-agent/charts/prometheus-agent/values.yaml index 58c1371..b3e09c9 100644 --- a/helm/prometheus-agent/charts/prometheus-agent/values.yaml +++ b/helm/prometheus-agent/charts/prometheus-agent/values.yaml @@ -1,6 +1,6 @@ global: image: - registry: docker.io + registry: gsoci.azurecr.io image: name: giantswarm/prometheus @@ -11,24 +11,24 @@ image: affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - preference: - matchExpressions: - - key: karpenter.sh/capacity-type - operator: NotIn - values: - - spot - weight: 100 + - preference: + matchExpressions: + - key: karpenter.sh/capacity-type + operator: NotIn + values: + - spot + weight: 100 podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchExpressions: - - key: operator.prometheus.io/name - operator: In - values: - - prometheus-agent - topologyKey: kubernetes.io/hostname - weight: 50 + - podAffinityTerm: + labelSelector: + matchExpressions: + - key: operator.prometheus.io/name + operator: In + values: + - prometheus-agent + topologyKey: kubernetes.io/hostname + weight: 50 keepDroppedTargets: 0 diff --git a/helm/prometheus-agent/values.yaml b/helm/prometheus-agent/values.yaml index d03ba87..65fdf75 100644 --- a/helm/prometheus-agent/values.yaml +++ b/helm/prometheus-agent/values.yaml @@ -1,6 +1,6 @@ global: image: - registry: docker.io + registry: gsoci.azurecr.io remoteWrite: [] # - name: "" # Name of the remote write integration # url: "" # URL to send data to @@ -24,24 +24,24 @@ prometheus-agent: affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - preference: - matchExpressions: - - key: karpenter.sh/capacity-type - operator: NotIn - values: - - spot - weight: 100 + - preference: + matchExpressions: + - key: karpenter.sh/capacity-type + operator: NotIn + values: + - spot + weight: 100 podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchExpressions: - - key: operator.prometheus.io/name - operator: In - values: - - prometheus-agent - topologyKey: kubernetes.io/hostname - weight: 50 + - podAffinityTerm: + labelSelector: + matchExpressions: + - key: operator.prometheus.io/name + operator: In + values: + - prometheus-agent + topologyKey: kubernetes.io/hostname + weight: 50 keepDroppedTargets: 0 @@ -86,19 +86,19 @@ prometheus-agent: relabelings: # Add app label. - sourceLabels: - - __meta_kubernetes_pod_label_app_kubernetes_io_name + - __meta_kubernetes_pod_label_app_kubernetes_io_name targetLabel: app # Add instance label. - sourceLabels: - - __meta_kubernetes_pod_label_app_kubernetes_io_instance + - __meta_kubernetes_pod_label_app_kubernetes_io_instance targetLabel: instance # Add node label. - sourceLabels: - - __meta_kubernetes_pod_node_name + - __meta_kubernetes_pod_node_name targetLabel: node # Add team label. - sourceLabels: - - __meta_kubernetes_pod_label_application_giantswarm_io_team + - __meta_kubernetes_pod_label_application_giantswarm_io_team targetLabel: team # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; From c02f9d0e6c6c7f681473040f5c84c4e4f95acb57 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Wed, 20 Dec 2023 12:01:11 +0100 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 502eab8..54b377e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Configure `gsoci.azurecr.io` as the default container image registry. + ## [0.6.6] - 2023-10-30 ### Added @@ -32,7 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Raise WATCHDOG_OVERLOAD_TOLERANCE from 2 to 5 to be more tolerant on desired shards. - + ## [0.6.3] - 2023-09-21 ### Changed From c968b8c786f9f8e5d17916ddbb59f8545f1c8210 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Wed, 20 Dec 2023 15:59:03 +0100 Subject: [PATCH 3/4] Revert indentation change --- helm/prometheus-agent/values.yaml | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/helm/prometheus-agent/values.yaml b/helm/prometheus-agent/values.yaml index 65fdf75..fe9c043 100644 --- a/helm/prometheus-agent/values.yaml +++ b/helm/prometheus-agent/values.yaml @@ -24,24 +24,24 @@ prometheus-agent: affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - preference: - matchExpressions: - - key: karpenter.sh/capacity-type - operator: NotIn - values: - - spot - weight: 100 + - preference: + matchExpressions: + - key: karpenter.sh/capacity-type + operator: NotIn + values: + - spot + weight: 100 podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchExpressions: - - key: operator.prometheus.io/name - operator: In - values: - - prometheus-agent - topologyKey: kubernetes.io/hostname - weight: 50 + - podAffinityTerm: + labelSelector: + matchExpressions: + - key: operator.prometheus.io/name + operator: In + values: + - prometheus-agent + topologyKey: kubernetes.io/hostname + weight: 50 keepDroppedTargets: 0 @@ -86,19 +86,19 @@ prometheus-agent: relabelings: # Add app label. - sourceLabels: - - __meta_kubernetes_pod_label_app_kubernetes_io_name + - __meta_kubernetes_pod_label_app_kubernetes_io_name targetLabel: app # Add instance label. - sourceLabels: - - __meta_kubernetes_pod_label_app_kubernetes_io_instance + - __meta_kubernetes_pod_label_app_kubernetes_io_instance targetLabel: instance # Add node label. - sourceLabels: - - __meta_kubernetes_pod_node_name + - __meta_kubernetes_pod_node_name targetLabel: node # Add team label. - sourceLabels: - - __meta_kubernetes_pod_label_application_giantswarm_io_team + - __meta_kubernetes_pod_label_application_giantswarm_io_team targetLabel: team # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; From 67ca2ad6940a6bc26f63cff936521ee702f00c2e Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Wed, 20 Dec 2023 15:59:37 +0100 Subject: [PATCH 4/4] Revert indentation change --- .../charts/prometheus-agent/values.yaml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/helm/prometheus-agent/charts/prometheus-agent/values.yaml b/helm/prometheus-agent/charts/prometheus-agent/values.yaml index b3e09c9..266d83e 100644 --- a/helm/prometheus-agent/charts/prometheus-agent/values.yaml +++ b/helm/prometheus-agent/charts/prometheus-agent/values.yaml @@ -11,24 +11,24 @@ image: affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - preference: - matchExpressions: - - key: karpenter.sh/capacity-type - operator: NotIn - values: - - spot - weight: 100 + - preference: + matchExpressions: + - key: karpenter.sh/capacity-type + operator: NotIn + values: + - spot + weight: 100 podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchExpressions: - - key: operator.prometheus.io/name - operator: In - values: - - prometheus-agent - topologyKey: kubernetes.io/hostname - weight: 50 + - podAffinityTerm: + labelSelector: + matchExpressions: + - key: operator.prometheus.io/name + operator: In + values: + - prometheus-agent + topologyKey: kubernetes.io/hostname + weight: 50 keepDroppedTargets: 0