https://github.com/cue-lang/cue/issues/3334

uhthomas · uhthomas · commit 5a1a4fef98e2 · 2024-07-28T19:08:35.000+01:00
diff --git a/k8s/amour/cilium/daemon_set_list.cue b/k8s/amour/cilium/daemon_set_list.cue
@@ -213,7 +213,7 @@ import (
 						mountPath: "/tmp"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							host: "127.0.0.1"
 							path: "/healthz"
diff --git a/k8s/amour/cilium/deployment_list.cue b/k8s/amour/cilium/deployment_list.cue
@@ -72,7 +72,7 @@ import (
 						readOnly:  true
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							host:   "127.0.0.1"
 							path:   "/healthz"
diff --git a/k8s/amour/dcgm_exporter/daemon_set_list.cue b/k8s/amour/dcgm_exporter/daemon_set_list.cue
@@ -52,7 +52,7 @@ import (
 						mountPath: "/var/lib/kubelet/pod-resources"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/health"
 							port: "http-metrics"
diff --git a/k8s/amour/emqx/stateful_set_list.cue b/k8s/amour/emqx/stateful_set_list.cue
@@ -55,7 +55,7 @@ import (
 						mountPath: "/opt/emqx/data"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/status"
 							port: "http"
diff --git a/k8s/amour/emqx_exporter/deployment_list.cue b/k8s/amour/emqx_exporter/deployment_list.cue
@@ -42,7 +42,7 @@ import (
 						subPath:   "config.yaml"
 					}]
 
-					let probe = {httpGet: port: "http-metrics"}
+					let probe = v1.#Probe & {httpGet: port: "http-metrics"}
 
 					livenessProbe:  probe
 					readinessProbe: probe
diff --git a/k8s/amour/external_dns/deployment_list.cue b/k8s/amour/external_dns/deployment_list.cue
@@ -46,7 +46,7 @@ import (
 						(v1.#ResourceMemory): "128Mi"
 					}
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/healthz"
 							port: "http-metrics"
diff --git a/k8s/amour/frigate/stateful_set_list.cue b/k8s/amour/frigate/stateful_set_list.cue
@@ -85,7 +85,7 @@ import (
 						mountPath: "/media"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/health"
 							port: "http"
diff --git a/k8s/amour/grafana/stateful_set_list.cue b/k8s/amour/grafana/stateful_set_list.cue
@@ -86,7 +86,7 @@ let plugins = [{
 						mountPath: "/tmp"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/api/health"
 							port: "http"
diff --git a/k8s/amour/grafana_operator/deployment_list.cue b/k8s/amour/grafana_operator/deployment_list.cue
@@ -45,7 +45,7 @@ import (
 						mountPath: "/tmp/dashboards"
 					}]
 
-					let probe = {httpGet: port: 8081}
+					let probe = v1.#Probe & {httpGet: port: 8081}
 
 					livenessProbe: probe & {
 						httpGet: path: "/healthz"
diff --git a/k8s/amour/home_assistant/stateful_set_list.cue b/k8s/amour/home_assistant/stateful_set_list.cue
@@ -38,7 +38,7 @@ import (
 					mountPath: "/config"
 				}]
 
-				let probe = {
+				let probe = v1.#Probe & {
 					httpGet: {
 						path: "/"
 						port: "http-metrics"
diff --git a/k8s/amour/karma/deployment_list.cue b/k8s/amour/karma/deployment_list.cue
@@ -42,7 +42,7 @@ import (
 						(v1.#ResourceMemory): "32Mi"
 					}
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/health"
 							port: "http"
diff --git a/k8s/amour/list.cue b/k8s/amour/list.cue
@@ -67,9 +67,9 @@ _#KindWeight: {
 })
 
 _items: [
-	amour.#ApplySetList.items,
-	amour.#ClusterSecretStoreList.items,
-	amour.#CustomResourceDefinitionList.items,
+	// amour.#ApplySetList.items,
+	// amour.#ClusterSecretStoreList.items,
+	// amour.#CustomResourceDefinitionList.items,
 	backup.#List.items,
 	cert_manager_csi_driver.#List.items,
 	cert_manager.#List.items,
diff --git a/k8s/amour/metrics_server/deployment_list.cue b/k8s/amour/metrics_server/deployment_list.cue
@@ -49,7 +49,7 @@ import (
 						mountPath: "/tmp"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							port:   "https"
 							scheme: v1.#URISchemeHTTPS
diff --git a/k8s/amour/minecraft/cf_atm9/stateful_set_list.cue b/k8s/amour/minecraft/cf_atm9/stateful_set_list.cue
@@ -135,7 +135,7 @@ import (
 						mountPath: "/downloads"
 					}]
 
-					let probe = {exec: command: ["mc-health"]}
+					let probe = v1.#Probe & v1.#Probe & {exec: command: ["mc-health"]}
 
 					livenessProbe:  probe
 					readinessProbe: probe
diff --git a/k8s/amour/minecraft/vanilla/stateful_set_list.cue b/k8s/amour/minecraft/vanilla/stateful_set_list.cue
@@ -64,7 +64,7 @@ import (
 						mountPath: "/data"
 					}]
 
-					let probe = {exec: command: ["mc-health"]}
+					let probe = v1.#Probe & {exec: command: ["mc-health"]}
 
 					livenessProbe:  probe
 					readinessProbe: probe
diff --git a/k8s/amour/node_exporter/daemon_set_list.cue b/k8s/amour/node_exporter/daemon_set_list.cue
@@ -63,7 +63,7 @@ import (
 						mountPropagation: v1.#MountPropagationHostToContainer
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/"
 							port: "http-metrics"
diff --git a/k8s/amour/node_feature_discovery/master/deployment_list.cue b/k8s/amour/node_feature_discovery/master/deployment_list.cue
@@ -52,7 +52,7 @@ import (
 						readOnly:  true
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						grpc: port: 8080
 						periodSeconds: 10
 					}
diff --git a/k8s/amour/onepassword_connect/deployment_list.cue b/k8s/amour/onepassword_connect/deployment_list.cue
@@ -58,7 +58,7 @@ import (
 						mountPath: "/home/opuser/.op/data"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: port: "api-http"
 						initialDelaySeconds: 15
 					}
@@ -109,7 +109,7 @@ import (
 						mountPath: "/home/opuser/.op/data"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: port: "sync-http"
 						initialDelaySeconds: 15
 					}
diff --git a/k8s/amour/ping_exporter/deployment_list.cue b/k8s/amour/ping_exporter/deployment_list.cue
@@ -43,7 +43,7 @@ import (
 						subPath:   "config.yaml"
 					}]
 
-					let probe = {httpGet: port: "http-metrics"}
+					let probe = v1.#Probe & {httpGet: port: "http-metrics"}
 
 					livenessProbe:  probe
 					readinessProbe: probe
diff --git a/k8s/amour/scrutiny/influxdb/stateful_set_list.cue b/k8s/amour/scrutiny/influxdb/stateful_set_list.cue
@@ -80,7 +80,7 @@ import (
 						mountPath: "/var/lib/influxdb2"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/health"
 							port: "http"
diff --git a/k8s/amour/scrutiny/web/stateful_set_list.cue b/k8s/amour/scrutiny/web/stateful_set_list.cue
@@ -52,7 +52,7 @@ import (
 						mountPath: "/opt/scrutiny/config"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/health"
 							port: "http"
diff --git a/k8s/amour/smartctl_exporter/daemon_set_list.cue b/k8s/amour/smartctl_exporter/daemon_set_list.cue
@@ -42,7 +42,7 @@ import (
 						mountPath: "/dev"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/"
 							port: "http-metrics"
diff --git a/k8s/amour/speedtest_exporter/deployment_list.cue b/k8s/amour/speedtest_exporter/deployment_list.cue
@@ -32,7 +32,7 @@ import (
 						(v1.#ResourceMemory): "200Mi"
 					}
 
-					let probe = {httpGet: port: "http-metrics"}
+					let probe = v1.#Probe & {httpGet: port: "http-metrics"}
 
 					livenessProbe:  probe
 					readinessProbe: probe
diff --git a/k8s/amour/trivy_system/deployment_list.cue b/k8s/amour/trivy_system/deployment_list.cue
@@ -61,7 +61,7 @@ import (
 						mountPath: "/tmp"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: port: "probes"
 						initialDelaySeconds: 5
 						periodSeconds:       10
diff --git a/k8s/amour/victoria_logs/stateful_set_list.cue b/k8s/amour/victoria_logs/stateful_set_list.cue
@@ -40,7 +40,7 @@ import (
 						mountPath: "/var/lib/victoria-logs"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/"
 							port: "http"
diff --git a/k8s/unwind/grafana/stateful_set_list.cue b/k8s/unwind/grafana/stateful_set_list.cue
@@ -68,7 +68,7 @@ import (
 						mountPath: "/mnt/secrets-store"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/api/health"
 							port: "http"
diff --git a/k8s/unwind/immich/immich_machine_learning/deployment_list.cue b/k8s/unwind/immich/immich_machine_learning/deployment_list.cue
@@ -74,7 +74,7 @@ import (
 						mountPath: "/usr/src/app/.transformers_cache"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/ping"
 							port: "http"
diff --git a/k8s/unwind/immich/immich_server/deployment_list.cue b/k8s/unwind/immich/immich_server/deployment_list.cue
@@ -113,7 +113,7 @@ import (
 						mountPath: "/mnt/secrets-store"
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/server-info/ping"
 							port: "http"
diff --git a/k8s/unwind/immich/typesense/stateful_set_list.cue b/k8s/unwind/immich/typesense/stateful_set_list.cue
@@ -46,7 +46,7 @@ import (
 						}
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/health"
 							port: "http"
diff --git a/k8s/unwind/minecraft/cf_atm8/stateful_set_list.cue b/k8s/unwind/minecraft/cf_atm8/stateful_set_list.cue
@@ -120,7 +120,7 @@ import (
 						mountPath: "/mnt/secrets-store"
 					}]
 
-					let probe = {exec: command: ["mc-health"]}
+					let probe = v1.#Probe & {exec: command: ["mc-health"]}
 
 					livenessProbe:  probe
 					readinessProbe: probe
diff --git a/k8s/unwind/minecraft/ftb_102/stateful_set_list.cue b/k8s/unwind/minecraft/ftb_102/stateful_set_list.cue
@@ -72,7 +72,7 @@ import (
 						mountPath: "/data"
 					}]
 
-					let probe = {exec: command: ["mc-health"]}
+					let probe = v1.#Probe & {exec: command: ["mc-health"]}
 
 					livenessProbe:  probe
 					readinessProbe: probe
diff --git a/k8s/unwind/minecraft/vanilla/stateful_set_list.cue b/k8s/unwind/minecraft/vanilla/stateful_set_list.cue
@@ -63,7 +63,7 @@ import (
 						mountPath: "/data"
 					}]
 
-					let probe = {exec: command: ["mc-health"]}
+					let probe = v1.#Probe & {exec: command: ["mc-health"]}
 
 					livenessProbe:  probe
 					readinessProbe: probe
diff --git a/k8s/unwind/node_exporter/daemon_set_list.cue b/k8s/unwind/node_exporter/daemon_set_list.cue
@@ -63,7 +63,7 @@ import (
 						mountPropagation: v1.#MountPropagationHostToContainer
 					}]
 
-					let probe = {
+					let probe = v1.#Probe & {
 						httpGet: {
 							path: "/"
 							port: "http-metrics"

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ import (`
`46`	`46`	`(v1.#ResourceMemory): "128Mi"`
`47`	`47`	`}`
`48`	`48`
`49`		`- let probe = {`
	`49`	`+ let probe = v1.#Probe & {`
`50`	`50`	`httpGet: {`
`51`	`51`	`path: "/healthz"`
`52`	`52`	`port: "http-metrics"`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ import (`
`42`	`42`	`(v1.#ResourceMemory): "32Mi"`
`43`	`43`	`}`
`44`	`44`
`45`		`- let probe = {`
	`45`	`+ let probe = v1.#Probe & {`
`46`	`46`	`httpGet: {`
`47`	`47`	`path: "/health"`
`48`	`48`	`port: "http"`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ import (`
`52`	`52`	`readOnly: true`
`53`	`53`	`}]`
`54`	`54`
`55`		`- let probe = {`
	`55`	`+ let probe = v1.#Probe & {`
`56`	`56`	`grpc: port: 8080`
`57`	`57`	`periodSeconds: 10`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`(v1.#ResourceMemory): "200Mi"`
`33`	`33`	`}`
`34`	`34`
`35`		`- let probe = {httpGet: port: "http-metrics"}`
	`35`	`+ let probe = v1.#Probe & {httpGet: port: "http-metrics"}`
`36`	`36`
`37`	`37`	`livenessProbe: probe`
`38`	`38`	`readinessProbe: probe`