Merge branch 'main' into renovate/golang.org-x-sync-0.x

aqua.yaml

@@ -8,7 +8,7 @@
 #   - all
 registries:
 - type: standard
-  ref: v4.306.1 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.307.0 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: yannh/kubeconform@v0.6.7
 - name: hashicorp/terraform@v1.10.5

k8s/_argocd/argocd_components/appproject.jsonnet

@@ -5,7 +5,7 @@
     name: 'default',
     namespace: (import 'app.json5').namespace,
     annotations: {
-      local slackChannel = 'walnuts-sysop',
+      local slackChannel = 'sysop',
       'notifications.argoproj.io/subscribe.on-deleted.slack': slackChannel,
       'notifications.argoproj.io/subscribe.on-health-degraded.slack': slackChannel,
       'notifications.argoproj.io/subscribe.on-sync-failed.slack': slackChannel,

k8s/_argocd/argocd_components/helm.jsonnet

@@ -3,6 +3,6 @@
   namespace: (import 'app.json5').namespace,
   chart: 'argo-cd',
   repoURL: 'https://argoproj.github.io/argo-helm',
-  targetRevision: '7.8.0',
+  targetRevision: '7.8.2',
   values: (importstr 'values.yaml'),
 }

k8s/apps/blog/deployment.jsonnet

@@ -23,7 +23,7 @@
         containers: [
           std.mergePatch((import '../../components/container.libsonnet') {
             name: 'nginx',
-            image: 'nginx:1.27.3',
+            image: 'nginx:1.27.4',
             ports: [
               {
                 containerPort: 8080,

k8s/apps/cilium/values.yaml

@@ -85,3 +85,7 @@ envoyConfig:
   secretsNamespace:
     create: false
     name: cilium-secrets
+tls:
+  secretsNamespace:
+    create: false
+    name: cilium-secrets

k8s/apps/cloudflare-tunnel-operator/helm.jsonnet

@@ -4,7 +4,7 @@
 
   chart: 'cloudflare-tunnel-operator',
   repoURL: 'https://walnuts1018.github.io/cloudflare-tunnel-operator/',
-  targetRevision: '1.2.1',
+  targetRevision: '1.2.2',
   valuesObject: std.mergePatch(std.parseYaml(importstr 'values.yaml'), {
     cloudflareToken: {
       existingSecret: (import 'external-secret.jsonnet').spec.target.name,

k8s/apps/loki/helm.jsonnet

@@ -3,6 +3,6 @@
   namespace: (import 'app.json5').namespace,
   chart: 'loki',
   repoURL: 'https://grafana.github.io/helm-charts',
-  targetRevision: '6.25.0',
+  targetRevision: '6.25.1',
   values: (importstr 'values.yaml'),
 }

k8s/apps/misskey/deployment.jsonnet

@@ -26,7 +26,7 @@
         initContainers: [
           (import '../../components/container.libsonnet') {
             name: 'misskey-init',
-            image: 'misskey/misskey:2025.1.0',
+            image: 'misskey/misskey:2025.2.0',
             imagePullPolicy: 'IfNotPresent',
             command: [
               'pnpm',
@@ -49,7 +49,7 @@
         containers: [
           (import '../../components/container.libsonnet') {
             name: 'misskey',
-            image: 'misskey/misskey:2025.1.0',
+            image: 'misskey/misskey:2025.2.0',
             imagePullPolicy: 'IfNotPresent',
             ports: [
               {

k8s/apps/nginx-test/deployment.jsonnet

@@ -23,7 +23,7 @@
         containers: [
           std.mergePatch((import '../../components/container.libsonnet') {
             name: 'nginx',
-            image: 'nginx:1.27.3',
+            image: 'nginx:1.27.4',
             ports: [
               {
                 containerPort: 8080,

k8s/apps/prometheus-stack/helm.jsonnet

@@ -4,7 +4,7 @@
 
   chart: 'kube-prometheus-stack',
   repoURL: 'https://prometheus-community.github.io/helm-charts',
-  targetRevision: '68.4.5',
+  targetRevision: '69.1.1',
   valuesObject: std.mergePatch(std.parseYaml(importstr 'values.yaml'), {
     prometheus: {
       prometheusSpec: {

k8s/apps/prometheus-stack/hpa.jsonnet

@@ -0,0 +1,30 @@
+{
+  apiVersion: 'autoscaling/v2',
+  kind: 'HorizontalPodAutoscaler',
+  metadata: {
+    name: (import 'app.json5').name + '-grafana',
+    namespace: (import 'app.json5').namespace,
+    labels: (import '../../components/labels.libsonnet') + { appname: (import 'app.json5').name + '-grafana' },
+  },
+  spec: {
+    minReplicas: 2,
+    maxReplicas: 6,
+    metrics: [
+      {
+        resource: {
+          name: 'memory',
+          target: {
+            averageUtilization: 100,
+            type: 'Utilization',
+          },
+        },
+        type: 'Resource',
+      },
+    ],
+    scaleTargetRef: {
+      apiVersion: 'apps/v1',
+      kind: 'Deployment',
+      name: 'prometheus-stack-grafana',
+    },
+  },
+}

k8s/apps/prometheus-stack/values.yaml

@@ -4,7 +4,7 @@ grafana:
     limits:
       memory: 800Mi
     requests:
-      memory: 150Mi
+      memory: 340Mi
   ingress:
     enabled: true
     hosts:

k8s/apps/renovate/cronjob.jsonnet

@@ -41,7 +41,7 @@
             containers: [
               (import '../../components/container.libsonnet') {
                 name: 'renovate',
-                image: 'renovate/renovate:39.160.1',
+                image: 'renovate/renovate:39.162.2',
                 resources: {
                   requests: {
                     cpu: '500m',

k8s/apps/walnuts-dev-www-redirect/deployment.jsonnet

@@ -23,7 +23,7 @@
         containers: [
           std.mergePatch((import '../../components/container.libsonnet') {
             name: 'nginx',
-            image: 'nginx:1.27.3',
+            image: 'nginx:1.27.4',
             ports: [
               {
                 containerPort: 8080,

k8s/apps/walnuts-dev/deployment.jsonnet

@@ -19,7 +19,7 @@
         containers: [
           std.mergePatch((import '../../components/container.libsonnet') {
             name: 'walnuts-dev',
-            image: 'ghcr.io/walnuts1018/walnuts.dev:97b7e1ce15e7ab2beb0e519d7af52101912bcff1-386',
+            image: 'ghcr.io/walnuts1018/walnuts.dev:f6b76e0fab016adf3cfb17b0d124f2bb5e6b20fe-388',
             imagePullPolicy: 'IfNotPresent',
             ports: [
               {

k8s/components/oauth2-proxy/helm.libsonnet

@@ -10,7 +10,7 @@
   namespace: error 'namespace is required',
   chart: 'oauth2-proxy',
   repoURL: 'https://oauth2-proxy.github.io/manifests',
-  targetRevision: '7.10.2',
+  targetRevision: '7.10.4',
   values: '',
   valuesObject: std.mergePatch((import 'values.libsonnet') {
     upstream: $.upstream,

renovate.json5

@@ -1,6 +1,6 @@
 {
   $schema: "https://docs.renovatebot.com/renovate-schema.json",
-  extends: ["config:recommended", "github>aquaproj/aqua-renovate-config#2.6.0"],
+  extends: ["config:recommended", "github>aquaproj/aqua-renovate-config#2.7.0"],
   dependencyDashboard: true,
   timezone: "Asia/Tokyo",
   kubernetes: {

scripts/infrautil/go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/google/go-jsonnet v0.20.0
 	github.com/google/subcommands v1.2.0
 	github.com/phsym/console-slog v0.3.1
-	github.com/pkg/errors v0.9.1
 	github.com/sters/yaml-diff v1.4.1
 	github.com/yosuke-furukawa/json5 v0.1.1
 	golang.org/x/sync v0.11.0
@@ -18,60 +17,60 @@ require (
 
 require (
 	dario.cat/mergo v1.0.1 // indirect
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.3.1 // indirect
+	github.com/Masterminds/semver/v3 v3.3.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
 	github.com/Masterminds/squirrel v1.5.4 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/chai2010/gettext-go v1.0.3 // indirect
-	github.com/containerd/containerd v1.7.25 // indirect
-	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/chai2010/gettext-go v1.0.2 // indirect
+	github.com/containerd/containerd v1.7.24 // indirect
+	github.com/containerd/errdefs v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/cyphar/filepath-securejoin v0.4.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/cli v27.5.0+incompatible // indirect
+	github.com/docker/cli v25.0.1+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v27.5.0+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.8.2 // indirect
+	github.com/docker/docker v25.0.6+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/fatih/color v1.18.0 // indirect
+	github.com/fatih/color v1.13.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
-	github.com/go-errors/errors v1.5.1 // indirect
+	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/goccy/go-yaml v1.15.13 // indirect
+	github.com/goccy/go-yaml v1.15.6 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/btree v1.1.3 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/btree v1.0.1 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -81,22 +80,22 @@ require (
 	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/mailru/easyjson v0.9.0 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/spdystream v0.5.0 // indirect
-	github.com/moby/term v0.5.2 // indirect
+	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -105,38 +104,37 @@ require (
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.19.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.61.0 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rubenv/sql-migrate v1.7.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
 	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.33.0 // indirect
-	go.opentelemetry.io/otel/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
+	go.opentelemetry.io/otel v1.28.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0 // indirect
 	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/oauth2 v0.25.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/grpc v1.69.4 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
+	golang.org/x/time v0.7.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	k8s.io/api v0.32.0 // indirect
@@ -147,12 +145,12 @@ require (
 	k8s.io/client-go v0.32.0 // indirect
 	k8s.io/component-base v0.32.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
 	k8s.io/kubectl v0.32.0 // indirect
-	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
-	oras.land/oras-go v1.2.6 // indirect
-	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	oras.land/oras-go v1.2.5 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
 	sigs.k8s.io/kustomize/api v0.18.0 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
 )