Update kubernetes-mixin

5pi · Sep 3, 2024 · 32a5a6f · 32a5a6f
1 parent 8db76df
commit 32a5a6f
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 69 deletions.
diff --git a/tests/jsonnetfile.json b/tests/jsonnetfile.json
@@ -8,15 +8,6 @@
           "subdir": "grafana"
         }
       },
-      "version": "d039275e4916aceae1c137120882e01d857787ac"
-    },
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": ""
-        }
-      },
       "version": "master"
     },
     {
@@ -35,7 +26,7 @@
           "subdir": ""
         }
       },
-      "version": "release-0.6"
+      "version": "master"
     },
     {
       "source": {

diff --git a/tests/jsonnetfile.lock.json b/tests/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "grafana"
         }
       },
-      "version": "d039275e4916aceae1c137120882e01d857787ac",
-      "sum": "515vMn4x4tP8vegL4HLW0nDO5+njGTgnDZB5OOhtsCI="
+      "version": "5698c8940b6dadca3f42107b7839557bc041761f",
+      "sum": "l6fPvh3tW6fWot308w71QY/amrYsFPeitvz1IgJxqQA="
     },
     {
       "source": {
@@ -34,22 +34,32 @@
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": ""
+          "remote": "https://github.com/grafana/grafonnet.git",
+          "subdir": "gen/grafonnet-latest"
+        }
+      },
+      "version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
+      "sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grafonnet.git",
+          "subdir": "gen/grafonnet-v11.0.0"
         }
       },
-      "version": "0ed0fe46fea3c7f47cc5859103f81684f59a85bc",
-      "sum": "/Onlwz+s5voC+xaju/WHp+OK5Xj8RbHCTypAq/OBg74="
+      "version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
+      "sum": "0BvzR0i4bS4hc2O3xDv6i9m52z7mPrjvqxtcPrGhynA="
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "grafana-builder"
+          "remote": "https://github.com/jsonnet-libs/docsonnet.git",
+          "subdir": "doc-util"
         }
       },
-      "version": "0ed0fe46fea3c7f47cc5859103f81684f59a85bc",
-      "sum": "EEPwMLfUIJT9iEUI/gCW9x6PxWoTBPSJOfabTF4rp1M="
+      "version": "6ac6c69685b8c29c54515448eaca583da2d88150",
+      "sum": "BrAL/k23jq+xy9oA7TWIhUx07dsA/QLm3g7ktCwe//U="
     },
     {
       "source": {
@@ -61,15 +71,25 @@
       "version": "6ecbb7709baf27f44b2e48f3529741ae6754ae6a",
       "sum": "0OMrWr4xnhN5VWLXwPzCmdcENsifLNAZNzPvrHAnUAo="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/xtd.git",
+          "subdir": ""
+        }
+      },
+      "version": "63d430b69a95741061c2f7fc9d84b1a778511d9c",
+      "sum": "qiZi3axUSXCVzKUF83zSAxklwrnitMmrDK4XAfjPMdE="
+    },
     {
       "source": {
         "git": {
           "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
           "subdir": ""
         }
       },
-      "version": "1941868d86a7c37e5505a14e3d567bda90e80357",
-      "sum": "ypWxhZVFWF53k7qIkSpUvnI6IGyFBNKmgrzjNtLwMIM="
+      "version": "b4f314e2d70505cea6ecdf82cafd8b3e989bd6fa",
+      "sum": "UMG9cPMJlglkQTER1T9t8lbZA0/kdH8/glwHo60txuk="
     },
     {
       "source": {
@@ -78,8 +98,8 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "85d1423b5b896f4fbce8394afed20cfe17371251",
-      "sum": "vR59KSqhRDBmKpYbia5VBs/1QFNFXud47G3+RfWSGnQ="
+      "version": "e6f359db36ab62b0238aff20bf568ad69f998a87",
+      "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
     },
     {
       "source": {
@@ -88,8 +108,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "c0c1a8c57241071c651a67a9e51cb233faf2d539",
-      "sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
+      "version": "b9d0932179a0c5b3a8863f3d6cdafe8584cedc8e",
+      "sum": "rhUvbqviGjQ2mwsRhHKMN0TiS3YvnYpUXHew3XlQ+Wg="
     }
   ],
   "legacyImports": false

diff --git a/tests/some-site/monitoring/grafana/dashboardDefinitions.yaml b/tests/some-site/monitoring/grafana/dashboardDefinitions.yaml
diff --git a/tests/some-site/monitoring/grafana/deployment.yaml b/tests/some-site/monitoring/grafana/deployment.yaml
@@ -48,6 +48,8 @@
             "drop":
             - "ALL"
           "readOnlyRootFilesystem": true
+          "seccompProfile":
+            "type": "RuntimeDefault"
         "volumeMounts":
         - "mountPath": "/var/lib/grafana"
           "name": "grafana-storage"
@@ -121,9 +123,6 @@
         - "mountPath": "/grafana-dashboard-definitions/0/scheduler"
           "name": "grafana-dashboard-scheduler"
           "readOnly": false
-        - "mountPath": "/grafana-dashboard-definitions/0/statefulset"
-          "name": "grafana-dashboard-statefulset"
-          "readOnly": false
         - "mountPath": "/grafana-dashboard-definitions/0/workload-total"
           "name": "grafana-dashboard-workload-total"
           "readOnly": false
@@ -209,9 +208,6 @@
       - "configMap":
           "name": "grafana-dashboard-scheduler"
         "name": "grafana-dashboard-scheduler"
-      - "configMap":
-          "name": "grafana-dashboard-statefulset"
-        "name": "grafana-dashboard-statefulset"
       - "configMap":
           "name": "grafana-dashboard-workload-total"
         "name": "grafana-dashboard-workload-total"

diff --git a/tests/some-site/monitoring/kube_state_metrics/deployment.yaml b/tests/some-site/monitoring/kube_state_metrics/deployment.yaml
@@ -25,7 +25,7 @@
         "livenessProbe":
           "httpGet":
             "path": "/livez"
-            "port": 8080
+            "port": "http-metrics"
           "initialDelaySeconds": 5
           "timeoutSeconds": 5
         "name": "kube-state-metrics"
@@ -36,8 +36,8 @@
           "name": "telemetry"
         "readinessProbe":
           "httpGet":
-            "path": "/metrics"
-            "port": 8081
+            "path": "/readyz"
+            "port": "telemetry"
           "initialDelaySeconds": 5
           "timeoutSeconds": 5
         "securityContext":

diff --git a/tests/some-site/monitoring/prometheus/configmap.yaml b/tests/some-site/monitoring/prometheus/configmap.yaml