Update jsonnetlib and tests

5pi · Jul 13, 2024 · 8db76df · 8db76df
1 parent b05ced4
commit 8db76df
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 28 deletions.
diff --git a/k.libsonnet b/k.libsonnet
@@ -1 +1 @@
-import 'github.com/jsonnet-libs/k8s-libsonnet/1.23/main.libsonnet'
+import 'github.com/jsonnet-libs/k8s-libsonnet/1.30/main.libsonnet'
diff --git a/tests/jsonnetfile.json b/tests/jsonnetfile.json
@@ -23,7 +23,7 @@
       "source": {
         "git": {
           "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
-          "subdir": "1.23"
+          "subdir": "1.30"
         }
       },
       "version": "main"
@@ -57,4 +57,4 @@
     }
   ],
   "legacyImports": true
-}
+}
diff --git a/tests/jsonnetfile.lock.json b/tests/jsonnetfile.lock.json
@@ -38,8 +38,8 @@
           "subdir": ""
         }
       },
-      "version": "c0abc546c782a095a22c277d36f871bb94ffc944",
-      "sum": "qhFsu+mtm4caVUqJg4o0oesFjLQ1gYwpXoMO+rmlwj0="
+      "version": "0ed0fe46fea3c7f47cc5859103f81684f59a85bc",
+      "sum": "/Onlwz+s5voC+xaju/WHp+OK5Xj8RbHCTypAq/OBg74="
     },
     {
       "source": {
@@ -48,18 +48,18 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "c0abc546c782a095a22c277d36f871bb94ffc944",
-      "sum": "xEFMv4+ObwP5L1Wu0XK5agWci4AJzNApys6iKAQxLlQ="
+      "version": "0ed0fe46fea3c7f47cc5859103f81684f59a85bc",
+      "sum": "EEPwMLfUIJT9iEUI/gCW9x6PxWoTBPSJOfabTF4rp1M="
     },
     {
       "source": {
         "git": {
           "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
-          "subdir": "1.23"
+          "subdir": "1.30"
         }
       },
-      "version": "44a9f3d21c089a01f62b22e25bdf553f488a74e8",
-      "sum": "3PWrwiLglLlJPWjtF5d0a/HP55QehRUFyzT5JMcwzew="
+      "version": "6ecbb7709baf27f44b2e48f3529741ae6754ae6a",
+      "sum": "0OMrWr4xnhN5VWLXwPzCmdcENsifLNAZNzPvrHAnUAo="
     },
     {
       "source": {
@@ -78,8 +78,8 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "84abaf71386f0c52c913e6da9002915a09018dce",
-      "sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
+      "version": "85d1423b5b896f4fbce8394afed20cfe17371251",
+      "sum": "vR59KSqhRDBmKpYbia5VBs/1QFNFXud47G3+RfWSGnQ="
     },
     {
       "source": {
@@ -88,8 +88,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "381f32b1c5943afb35940b88c45c3fa4bf5fc1de",
-      "sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM="
+      "version": "c0c1a8c57241071c651a67a9e51cb233faf2d539",
+      "sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
     }
   ],
   "legacyImports": false

diff --git a/tests/some-site/media/nzbget/configmap.yaml b/tests/some-site/media/nzbget/configmap.yaml
@@ -117,7 +117,6 @@
     ScriptPauseQueue=no
     ShellOverride=
     EventInterval=0
-    
 "kind": "ConfigMap"
 "metadata":
   "name": "nzbget-config"

diff --git a/tests/some-site/media/radarr/deployment.yaml b/tests/some-site/media/radarr/deployment.yaml
@@ -16,15 +16,23 @@
         "name": "radarr"
     "spec":
       "containers":
-      - "image": "lscr.io/linuxserver/radarr:4.7.5.7809-ls187"
+      - "command":
+        - "/app/radarr/bin/Radarr"
+        - "--data=/config/"
+        "image": "lscr.io/linuxserver/radarr:5.7.0.8882-ls228"
         "name": "radarr"
         "volumeMounts":
         - "mountPath": "/config"
           "name": "radarr"
         - "mountPath": "/media"
           "name": "media"
+      "dnsConfig":
+        "options":
+        - "name": "ndots"
+          "value": "1"
       "securityContext":
         "fsGroup": 1000
+        "runAsUser": 1000
       "volumes":
       - "name": "radarr"
         "persistentVolumeClaim":

diff --git a/tests/some-site/media/sonarr/deployment.yaml b/tests/some-site/media/sonarr/deployment.yaml
@@ -25,6 +25,7 @@
           "name": "media"
       "securityContext":
         "fsGroup": 1000
+        "runAsUser": 1000
       "volumes":
       - "name": "sonarr"
         "persistentVolumeClaim":

diff --git a/tests/some-site/monitoring/blackbox_exporter/configmap.yaml b/tests/some-site/monitoring/blackbox_exporter/configmap.yaml
@@ -1,6 +1,6 @@
 "apiVersion": "v1"
 "data":
-  "config.yaml": "\"modules\":\n  \"http_2xx\":\n    \"http\": null\n    \"prober\": \"http\"\n    \"timeout\": \"5s\"\n  \"http_post_2xx\":\n    \"http\":\n      \"body_size_limit\": \"1MB\"\n      \"method\": \"POST\"\n    \"prober\": \"http\"\n    \"timeout\": \"5s\"\n  \"icmp_test\":\n    \"icmp\":\n      \"preferred_ip_protocol\": \"ip4\"\n    \"prober\": \"icmp\"\n    \"timeout\": \"5s\"\n  \"irc_banner\":\n    \"prober\": \"tcp\"\n    \"tcp\":\n      \"query_response\":\n      - \"send\": \"NICK prober\"\n      - \"send\": \"USER prober prober prober :prober\"\n      - \"expect\": \"PING :([^ ]+)\"\n        \"send\": \"PONG ${1}\"\n      - \"expect\": \"^:[^ ]+ 001\"\n    \"timeout\": \"5s\"\n  \"pop3s_banner\":\n    \"prober\": \"tcp\"\n    \"tcp\":\n      \"query_response\":\n      - \"expect\": \"^+OK\"\n      \"tls\": true\n      \"tls_config\":\n        \"insecure_skip_verify\": false\n  \"smtp_starttls\":\n    \"prober\": \"tcp\"\n    \"tcp\":\n      \"query_response\":\n      - \"expect\": \"^220 \"\n      - \"send\": \"EHLO prober\\r\"\n      - \"expect\": \"^250-STARTTLS\"\n      - \"send\": \"STARTTLS\\r\"\n      - \"expect\": \"^220\"\n      - \"starttls\": true\n      - \"send\": \"EHLO prober\\r\"\n      - \"expect\": \"^250-AUTH\"\n      - \"send\": \"QUIT\\r\"\n    \"timeout\": \"5s\"\n  \"ssh_banner\":\n    \"prober\": \"tcp\"\n    \"tcp\":\n      \"query_response\":\n      - \"expect\": \"^SSH-2.0-\"\n    \"timeout\": \"5s\"\n  \"tcp_connect\":\n    \"prober\": \"tcp\"\n    \"timeout\": \"5s\""
+  "config.yaml": "\"modules\":\n  \"http_2xx\":\n    \"prober\": \"http\"\n    \"timeout\": \"5s\"\n  \"http_post_2xx\":\n    \"http\":\n      \"body_size_limit\": \"1MB\"\n      \"method\": \"POST\"\n    \"prober\": \"http\"\n    \"timeout\": \"5s\"\n  \"icmp_test\":\n    \"icmp\":\n      \"preferred_ip_protocol\": \"ip4\"\n    \"prober\": \"icmp\"\n    \"timeout\": \"5s\"\n  \"irc_banner\":\n    \"prober\": \"tcp\"\n    \"tcp\":\n      \"query_response\":\n      - \"send\": \"NICK prober\"\n      - \"send\": \"USER prober prober prober :prober\"\n      - \"expect\": \"PING :([^ ]+)\"\n        \"send\": \"PONG ${1}\"\n      - \"expect\": \"^:[^ ]+ 001\"\n    \"timeout\": \"5s\"\n  \"pop3s_banner\":\n    \"prober\": \"tcp\"\n    \"tcp\":\n      \"query_response\":\n      - \"expect\": \"^+OK\"\n      \"tls\": true\n      \"tls_config\":\n        \"insecure_skip_verify\": false\n  \"smtp_starttls\":\n    \"prober\": \"tcp\"\n    \"tcp\":\n      \"query_response\":\n      - \"expect\": \"^220 \"\n      - \"send\": \"EHLO prober\\r\"\n      - \"expect\": \"^250-STARTTLS\"\n      - \"send\": \"STARTTLS\\r\"\n      - \"expect\": \"^220\"\n      - \"starttls\": true\n      - \"send\": \"EHLO prober\\r\"\n      - \"expect\": \"^250-AUTH\"\n      - \"send\": \"QUIT\\r\"\n    \"timeout\": \"5s\"\n  \"ssh_banner\":\n    \"prober\": \"tcp\"\n    \"tcp\":\n      \"query_response\":\n      - \"expect\": \"^SSH-2.0-\"\n    \"timeout\": \"5s\"\n  \"tcp_connect\":\n    \"prober\": \"tcp\"\n    \"timeout\": \"5s\""
 "kind": "ConfigMap"
 "metadata":
   "name": "blackbox-exporter"

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/kube_state_metrics/deployment.yaml b/tests/some-site/monitoring/kube_state_metrics/deployment.yaml
@@ -24,7 +24,7 @@
       - "image": "k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0"
         "livenessProbe":
           "httpGet":
-            "path": "/healthz"
+            "path": "/livez"
             "port": 8080
           "initialDelaySeconds": 5
           "timeoutSeconds": 5
@@ -36,7 +36,7 @@
           "name": "telemetry"
         "readinessProbe":
           "httpGet":
-            "path": "/"
+            "path": "/metrics"
             "port": 8081
           "initialDelaySeconds": 5
           "timeoutSeconds": 5

diff --git a/tests/some-site/monitoring/prometheus/configmap.yaml b/tests/some-site/monitoring/prometheus/configmap.yaml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import 'github.com/jsonnet-libs/k8s-libsonnet/1.23/main.libsonnet'
		import 'github.com/jsonnet-libs/k8s-libsonnet/1.30/main.libsonnet'