Skip to content

Commit

Permalink
feat: update to operator version 0.39.1
Browse files Browse the repository at this point in the history
  • Loading branch information
argoyle committed Feb 17, 2024
1 parent 08808a1 commit 5a462e9
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 20 deletions.
41 changes: 25 additions & 16 deletions grafana-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
---
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion grafana/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ksm/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions locals.tf
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 5a462e9

Please sign in to comment.