Skip to content

Commit

Permalink
regenerates k8s manifests
Browse files Browse the repository at this point in the history
Signed-off-by: Weifeng Wang <[email protected]>

regenerates k8s manifests

Signed-off-by: Weifeng Wang <[email protected]>
  • Loading branch information
qclaogui committed Sep 2, 2024
1 parent 4650a19 commit e1a6b1e
Show file tree
Hide file tree
Showing 24 changed files with 341 additions and 371 deletions.
2 changes: 1 addition & 1 deletion ci/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"dagger.io/dagger"
)

const goImage = "golang:1.22.1"
const goImage = "golang:1.23.1"

func main() {
println("Dagger is a programmable CI/CD engine that runs your pipelines in containers.")
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/qclaogui/codelab-monitoring
go 1.23

require (
dagger.io/dagger v0.12.6
dagger.io/dagger v0.12.7
github.com/MakeNowJust/heredoc v1.0.0
github.com/blang/semver v3.5.1+incompatible
github.com/dave/jennifer v1.7.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dagger.io/dagger v0.12.6 h1:O7ugzjt5e/ZYTSqMWVn5iWiWhd0wEoycTfguUm39y7s=
dagger.io/dagger v0.12.6/go.mod h1:Qxqy5hz1MLMdmVOaByAKpTa/c7K0R0NuxPZX5ZzEneM=
dagger.io/dagger v0.12.7 h1:xMwRc/szSsEkixkmSAnWoRMfejBKipxoVuHiNGOWXpE=
dagger.io/dagger v0.12.7/go.mod h1:Qxqy5hz1MLMdmVOaByAKpTa/c7K0R0NuxPZX5ZzEneM=
github.com/99designs/gqlgen v0.17.49 h1:b3hNGexHd33fBSAd4NDT/c3NCcQzcAVkknhN9ym36YQ=
github.com/99designs/gqlgen v0.17.49/go.mod h1:tC8YFVZMed81x7UJ7ORUwXF4Kn6SXuucFqQBhN8+BU0=
github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w=
Expand Down
16 changes: 8 additions & 8 deletions kubernetes/common/alloy/manifests/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/name: alloy
app.kubernetes.io/part-of: alloy
app.kubernetes.io/version: v1.3.1
helm.sh/chart: alloy-0.6.1
helm.sh/chart: alloy-0.7.0
name: alloy
namespace: monitoring-system
---
Expand All @@ -22,7 +22,7 @@ metadata:
app.kubernetes.io/name: alloy
app.kubernetes.io/part-of: alloy
app.kubernetes.io/version: v1.3.1
helm.sh/chart: alloy-0.6.1
helm.sh/chart: alloy-0.7.0
name: alloy
rules:
- apiGroups:
Expand Down Expand Up @@ -126,7 +126,7 @@ metadata:
app.kubernetes.io/name: alloy
app.kubernetes.io/part-of: alloy
app.kubernetes.io/version: v1.3.1
helm.sh/chart: alloy-0.6.1
helm.sh/chart: alloy-0.7.0
name: alloy
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down Expand Up @@ -4394,7 +4394,7 @@ metadata:
app.kubernetes.io/name: alloy
app.kubernetes.io/part-of: alloy
app.kubernetes.io/version: v1.3.1
helm.sh/chart: alloy-0.6.1
helm.sh/chart: alloy-0.7.0
name: alloy
namespace: monitoring-system
spec:
Expand Down Expand Up @@ -4435,7 +4435,7 @@ metadata:
app.kubernetes.io/name: alloy
app.kubernetes.io/part-of: alloy
app.kubernetes.io/version: v1.3.1
helm.sh/chart: alloy-0.6.1
helm.sh/chart: alloy-0.7.0
name: alloy-cluster
namespace: monitoring-system
spec:
Expand Down Expand Up @@ -4476,7 +4476,7 @@ metadata:
app.kubernetes.io/name: alloy
app.kubernetes.io/part-of: alloy
app.kubernetes.io/version: v1.3.1
helm.sh/chart: alloy-0.6.1
helm.sh/chart: alloy-0.7.0
name: alloy
namespace: monitoring-system
spec:
Expand Down Expand Up @@ -4692,7 +4692,7 @@ metadata:
app.kubernetes.io/name: alloy
app.kubernetes.io/part-of: alloy
app.kubernetes.io/version: v1.3.1
helm.sh/chart: alloy-0.6.1
helm.sh/chart: alloy-0.7.0
name: alloy
namespace: monitoring-system
spec:
Expand All @@ -4715,7 +4715,7 @@ metadata:
app.kubernetes.io/name: alloy
app.kubernetes.io/part-of: alloy
app.kubernetes.io/version: v1.3.1
helm.sh/chart: alloy-0.6.1
helm.sh/chart: alloy-0.7.0
name: alloy
namespace: monitoring-system
spec:
Expand Down
10 changes: 5 additions & 5 deletions kubernetes/common/grafana/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ helmCharts:
includeCRDs: false
skipTests: true
valuesFile: values-k3d-k3s.yaml
images:
- name: docker.io/grafana/grafana
newTag: 11.1.3
- name: quay.io/kiwigrid/k8s-sidecar
newTag: 1.26.1
# images:
# - name: docker.io/grafana/grafana
# newTag: 11.1.5
# - name: quay.io/kiwigrid/k8s-sidecar
# newTag: 1.27.4
resources:
- namespace.yaml
configMapGenerator:
Expand Down
46 changes: 23 additions & 23 deletions kubernetes/common/grafana/manifests/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana
namespace: monitoring-system
---
Expand All @@ -23,8 +23,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana
namespace: monitoring-system
rules: []
Expand All @@ -36,8 +36,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana-clusterrole
rules:
- apiGroups:
Expand All @@ -57,8 +57,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana
namespace: monitoring-system
roleRef:
Expand All @@ -77,8 +77,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana-clusterrolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down Expand Up @@ -156,8 +156,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana-config-dashboards
namespace: monitoring-system
---
Expand Down Expand Up @@ -4225,8 +4225,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana
namespace: monitoring-system
spec:
Expand All @@ -4247,8 +4247,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana
namespace: monitoring-system
spec:
Expand Down Expand Up @@ -4303,7 +4303,7 @@ spec:
value: http://localhost:3000/api/admin/provisioning/dashboards/reload
- name: REQ_METHOD
value: POST
image: quay.io/kiwigrid/k8s-sidecar:1.26.1
image: quay.io/kiwigrid/k8s-sidecar:1.27.4
imagePullPolicy: IfNotPresent
name: grafana-sc-dashboard
securityContext:
Expand Down Expand Up @@ -4343,7 +4343,7 @@ spec:
value: http://localhost:3000/api/admin/provisioning/datasources/reload
- name: REQ_METHOD
value: POST
image: quay.io/kiwigrid/k8s-sidecar:1.26.1
image: quay.io/kiwigrid/k8s-sidecar:1.27.4
imagePullPolicy: IfNotPresent
name: grafana-sc-datasources
securityContext:
Expand Down Expand Up @@ -4383,7 +4383,7 @@ spec:
- secretRef:
name: grafana-env
optional: true
image: docker.io/grafana/grafana:11.1.3
image: docker.io/grafana/grafana:11.1.5
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 10
Expand Down Expand Up @@ -4462,8 +4462,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana
namespace: monitoring-system
spec:
Expand All @@ -4490,8 +4490,8 @@ metadata:
app.kubernetes.io/instance: grafana
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
app.kubernetes.io/version: 11.1.4
helm.sh/chart: grafana-8.4.8
app.kubernetes.io/version: 11.1.5
helm.sh/chart: grafana-8.5.0
name: grafana
namespace: monitoring-system
spec:
Expand Down
Loading

0 comments on commit e1a6b1e

Please sign in to comment.