From 5a462e98459b4fd55ffd0c7d5b0bfe72b1fee627 Mon Sep 17 00:00:00 2001 From: Joakim Olsson Date: Sat, 17 Feb 2024 16:34:53 +0100 Subject: [PATCH] feat: update to operator version 0.39.1 --- grafana-agent.yaml | 41 +++++++++++++++++++++++--------------- grafana/kustomization.yaml | 2 +- ksm/kustomization.yaml | 2 +- locals.tf | 4 ++-- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/grafana-agent.yaml b/grafana-agent.yaml index c514f73..2834f1c 100644 --- a/grafana-agent.yaml +++ b/grafana-agent.yaml @@ -13603,13 +13603,12 @@ metadata: app.kubernetes.io/instance: grafana-agent-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: grafana-agent-operator - app.kubernetes.io/version: 0.38.0 - helm.sh/chart: grafana-agent-operator-0.3.11 + app.kubernetes.io/version: 0.39.1 + helm.sh/chart: grafana-agent-operator-0.3.15 name: grafana-agent-operator namespace: grafana-agent --- apiVersion: v1 -imagePullSecrets: null kind: ServiceAccount metadata: labels: @@ -13619,7 +13618,7 @@ metadata: app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/version: 2.10.1 - helm.sh/chart: kube-state-metrics-5.15.2 + helm.sh/chart: kube-state-metrics-5.16.0 name: ksm-kube-state-metrics namespace: kube-system --- @@ -13631,8 +13630,8 @@ metadata: app.kubernetes.io/instance: grafana-agent-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: grafana-agent-operator - app.kubernetes.io/version: 0.38.0 - helm.sh/chart: grafana-agent-operator-0.3.11 + app.kubernetes.io/version: 0.39.1 + helm.sh/chart: grafana-agent-operator-0.3.15 name: grafana-agent-operator rules: - apiGroups: @@ -13730,7 +13729,7 @@ metadata: app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/version: 2.10.1 - helm.sh/chart: kube-state-metrics-5.15.2 + helm.sh/chart: kube-state-metrics-5.16.0 name: ksm-kube-state-metrics rules: - apiGroups: @@ -13942,8 +13941,8 @@ metadata: app.kubernetes.io/instance: grafana-agent-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: grafana-agent-operator - app.kubernetes.io/version: 0.38.0 - helm.sh/chart: grafana-agent-operator-0.3.11 + app.kubernetes.io/version: 0.39.1 + helm.sh/chart: grafana-agent-operator-0.3.15 name: grafana-agent-operator roleRef: apiGroup: rbac.authorization.k8s.io @@ -13964,7 +13963,7 @@ metadata: app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/version: 2.10.1 - helm.sh/chart: kube-state-metrics-5.15.2 + helm.sh/chart: kube-state-metrics-5.16.0 name: ksm-kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -13987,7 +13986,7 @@ metadata: app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/version: 2.10.1 - helm.sh/chart: kube-state-metrics-5.15.2 + helm.sh/chart: kube-state-metrics-5.16.0 name: ksm-kube-state-metrics namespace: kube-system spec: @@ -14009,8 +14008,8 @@ metadata: app.kubernetes.io/instance: grafana-agent-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: grafana-agent-operator - app.kubernetes.io/version: 0.38.0 - helm.sh/chart: grafana-agent-operator-0.3.11 + app.kubernetes.io/version: 0.39.1 + helm.sh/chart: grafana-agent-operator-0.3.15 name: grafana-agent-operator namespace: grafana-agent spec: @@ -14028,7 +14027,7 @@ spec: containers: - args: - --kubelet-service=default/kubelet - image: docker.io/grafana/agent-operator:v0.37.4 + image: docker.io/grafana/agent-operator:v0.39.1 imagePullPolicy: IfNotPresent name: grafana-agent-operator resources: @@ -14047,7 +14046,7 @@ metadata: app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/version: 2.10.1 - helm.sh/chart: kube-state-metrics-5.15.2 + helm.sh/chart: kube-state-metrics-5.16.0 name: ksm-kube-state-metrics namespace: kube-system spec: @@ -14068,7 +14067,7 @@ spec: app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/version: 2.10.1 - helm.sh/chart: kube-state-metrics-5.15.2 + helm.sh/chart: kube-state-metrics-5.16.0 spec: containers: - args: @@ -14077,20 +14076,30 @@ spec: image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.10.1 imagePullPolicy: IfNotPresent livenessProbe: + failureThreshold: 3 httpGet: + httpHeaders: null path: /healthz port: 8080 + scheme: HTTP initialDelaySeconds: 5 + periodSeconds: 10 + successThreshold: 1 timeoutSeconds: 5 name: kube-state-metrics ports: - containerPort: 8080 name: http readinessProbe: + failureThreshold: 3 httpGet: + httpHeaders: null path: / port: 8080 + scheme: HTTP initialDelaySeconds: 5 + periodSeconds: 10 + successThreshold: 1 timeoutSeconds: 5 resources: requests: diff --git a/grafana/kustomization.yaml b/grafana/kustomization.yaml index e10c2ad..9cd2fb4 100644 --- a/grafana/kustomization.yaml +++ b/grafana/kustomization.yaml @@ -7,7 +7,7 @@ helmCharts: - name: grafana-agent-operator namespace: grafana-agent repo: https://grafana.github.io/helm-charts - version: 0.3.11 + version: 0.3.15 releaseName: grafana-agent-operator includeCRDs: true valuesFile: operator-values.yaml diff --git a/ksm/kustomization.yaml b/ksm/kustomization.yaml index 9100bdf..450b0ac 100644 --- a/ksm/kustomization.yaml +++ b/ksm/kustomization.yaml @@ -4,7 +4,7 @@ helmCharts: - name: kube-state-metrics namespace: kube-system repo: https://prometheus-community.github.io/helm-charts - version: 5.15.2 + version: 5.16.0 releaseName: ksm includeCRDs: true valuesFile: ksm-values.yaml diff --git a/locals.tf b/locals.tf index 3aa8be4..12c3927 100644 --- a/locals.tf +++ b/locals.tf @@ -1,6 +1,6 @@ locals { - version = "0.37.4" - agent_version = "0.38.1" + version = "0.39.1" + agent_version = "0.39.2" yaml = templatefile("${path.module}/custom-resources.yaml.tmpl", { cluster_name = var.cluster_name external_labels = merge({ cluster = var.cluster_name }, var.external_labels)