Merge pull request #178 from xrstf/improve-tests

kcp-ci-bot · web-flow · commit 5bb3b1d025e8 · 2025-11-27T15:54:10.000+01:00
improve testing, fix examples for hostAliases
diff --git a/charts/api-syncagent/Chart.yaml b/charts/api-syncagent/Chart.yaml
@@ -3,7 +3,7 @@ name: api-syncagent
 description: A Kubernetes agent to synchronize APIs and their objects between Kubernetes clusters and kcp.
 
 # version information
-version: 0.4.4
+version: 0.4.5
 appVersion: "v0.4.2"
 
 # optional metadata
diff --git a/charts/api-syncagent/tests/default.yaml b/charts/api-syncagent/tests/default.yaml
@@ -0,0 +1,3 @@
+externalHostname: ci.kcp.io
+apiExportName: my-api
+kcpKubeconfig: kcp-kubeconfig
diff --git a/charts/api-syncagent/tests/hostaliases.yaml b/charts/api-syncagent/tests/hostaliases.yaml
@@ -0,0 +1,10 @@
+externalHostname: ci.kcp.io
+apiExportName: my-api
+kcpKubeconfig: kcp-kubeconfig
+
+hostAliases:
+  enabled: true
+  values:
+    - ip: "1.2.3.5"
+      hostnames:
+      - "mysvc.example.dev.local"
diff --git a/charts/api-syncagent/values.yaml b/charts/api-syncagent/values.yaml
@@ -91,5 +91,5 @@ extraVolumeMounts: []
 hostAliases:
   enabled: false
   values:
-    ip: ""
-    hostnames: []
+    - ip: ""
+      hostnames: []
diff --git a/charts/cache/Chart.yaml b/charts/cache/Chart.yaml
@@ -3,7 +3,7 @@ name: cache
 description: A cache server for prototype of a multi-tenant Kubernetes control plane for workloads on many clusters
 
 # version information
-version: 0.0.5
+version: 0.0.6
 appVersion: "0.22.0"
 
 # optional metadata
diff --git a/charts/cache/tests/default.yaml b/charts/cache/tests/default.yaml
@@ -0,0 +1 @@
+{}
diff --git a/charts/cache/tests/hostaliases.yaml b/charts/cache/tests/hostaliases.yaml
@@ -0,0 +1,7 @@
+cache:
+  hostAliases:
+    enabled: true
+    values:
+      - ip: "1.2.3.5"
+        hostnames:
+        - "mysvc.example.dev.local"
diff --git a/charts/cache/values.yaml b/charts/cache/values.yaml
@@ -30,8 +30,8 @@ cache:
   hostAliases:
     enabled: false
     values:
-      ip: ""
-      hostnames: []
+      - ip: ""
+        hostnames: []
   securityContext:
     seccompProfile:
       type: RuntimeDefault
diff --git a/charts/certificates/tests/default.yaml b/charts/certificates/tests/default.yaml
@@ -0,0 +1 @@
+{}
diff --git a/charts/kcp-operator/tests/default.yaml b/charts/kcp-operator/tests/default.yaml
@@ -0,0 +1 @@
+{}
diff --git a/charts/kcp/Chart.yaml b/charts/kcp/Chart.yaml
@@ -3,7 +3,7 @@ name: kcp
 description: A prototype of a multi-tenant Kubernetes control plane for workloads on many clusters
 
 # version information
-version: 0.12.6
+version: 0.12.7
 appVersion: "0.28.3"
 
 # optional metadata
diff --git a/charts/kcp/tests/default.yaml b/charts/kcp/tests/default.yaml
@@ -0,0 +1 @@
+externalHostname: ci.kcp.io
diff --git a/charts/kcp/tests/hostaliases.yaml b/charts/kcp/tests/hostaliases.yaml
@@ -0,0 +1,17 @@
+externalHostname: ci.kcp.io
+
+kcp:
+  hostAliases:
+    enabled: true
+    values:
+      - ip: "1.2.3.5"
+        hostnames:
+        - "kcp.example.dev.local"
+
+kcpFrontProxy:
+  hostAliases:
+    enabled: true
+    values:
+      - ip: "8.7.6.4"
+        hostnames:
+        - "frontproxy.example.dev.local"
diff --git a/charts/kcp/values.yaml b/charts/kcp/values.yaml
@@ -130,6 +130,9 @@ kcp:
 
   hostAliases:
     enabled: false
+    values:
+      - ip: ""
+        hostnames: []
 
   homeWorkspaces:
     enabled: false
@@ -260,6 +263,9 @@ kcpFrontProxy:
 
   hostAliases:
     enabled: false
+    values:
+      - ip: ""
+        hostnames: []
 
   securityContext:
     seccompProfile:
diff --git a/charts/proxy/Chart.yaml b/charts/proxy/Chart.yaml
@@ -3,7 +3,7 @@ name: proxy
 description: A prototype of a multi-tenant Kubernetes control plane for workloads on many clusters
 
 # version information
-version: 0.0.4
+version: 0.0.5
 appVersion: "0.22.0"
 
 # optional metadata
diff --git a/charts/proxy/tests/default.yaml b/charts/proxy/tests/default.yaml
@@ -0,0 +1 @@
+{}
diff --git a/charts/proxy/tests/hostaliases.yaml b/charts/proxy/tests/hostaliases.yaml
@@ -0,0 +1,7 @@
+kcpFrontProxy:
+  hostAliases:
+    enabled: true
+    values:
+      - ip: "1.2.3.5"
+        hostnames:
+        - "mysvc.example.dev.local"
diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml
@@ -57,6 +57,9 @@ kcpFrontProxy:
       memory: 1Gi
   hostAliases:
     enabled: false
+    values:
+      - ip: ""
+        hostnames: []
   securityContext:
     seccompProfile:
       type: RuntimeDefault
diff --git a/charts/shard/Chart.yaml b/charts/shard/Chart.yaml
@@ -3,7 +3,7 @@ name: shard
 description: A prototype of a multi-tenant Kubernetes control plane for workloads on many clusters
 
 # version information
-version: 0.0.4
+version: 0.0.5
 appVersion: "0.22.0"
 
 # optional metadata
diff --git a/charts/shard/tests/default.yaml b/charts/shard/tests/default.yaml
@@ -0,0 +1 @@
+externalHostname: ci.kcp.io
diff --git a/charts/shard/tests/hostaliases.yaml b/charts/shard/tests/hostaliases.yaml
@@ -0,0 +1,9 @@
+externalHostname: ci.kcp.io
+
+kcp:
+  hostAliases:
+    enabled: true
+    values:
+      - ip: "1.2.3.5"
+        hostnames:
+        - "mysvc.example.dev.local"
diff --git a/charts/shard/values.yaml b/charts/shard/values.yaml
@@ -68,6 +68,9 @@ kcp:
         system-token,system,6666-6666-6666-6666,"system:masters"
   hostAliases:
     enabled: false
+    values:
+      - ip: ""
+        hostnames: []
   homeWorkspaces:
     enabled: false
   securityContext:
diff --git a/hack/ci/render-helm-charts.sh b/hack/ci/render-helm-charts.sh
@@ -14,29 +14,52 @@ if ! [ -x "$(command -v kubeconform)" ]; then
   exit 1
 fi
 
+repeat() {
+  local end=$1
+  local str="${2:-=}"
+
+  for i in $(seq 1 $end); do
+    echo -n "${str}"
+  done
+}
+
+heading() {
+  local title="$@"
+  echo "$title"
+  repeat ${#title} "="
+  echo
+  echo
+}
+
 for dir in ./charts/*/; do
-  dir=${dir%*/}
-  chart=${dir##*/}
-
-  helm template \
-    --debug \
-    --set=externalHostname=ci.kcp.io \
-    --set=apiExportName=my-api \
-    --set=kcpKubeconfig=kcp-kubeconfig \
-    kcp ./charts/${chart}/ | tee ${chart}-templated.yaml
-
-  echo "---"
-
-  # run kubeconform on template output to validate Kubernetes resources.
-  # the external schema-location allows us to validate resources for
-  # common CRDs (e.g. cert-manager resources).
-  kubeconform \
-    -schema-location default \
-    -schema-location 'https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json' \
-    -schema-location "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/{{.NormalizedKubernetesVersion}}/{{.ResourceKind}}.json" \
-    -strict \
-    -summary \
-    ${chart}-templated.yaml
-
-  rm ${chart}-templated.yaml
+  dir="${dir%*/}"
+  chart="${dir##*/}"
+
+  for testfile in "$dir"/tests/*.yaml; do
+    heading "$chart: $(basename $testfile)"
+
+    tmpFile="$chart-templated.yaml"
+    helm template \
+      --debug \
+      --values "$testfile" \
+      "$chart" "$dir" | tee "$tmpFile"
+
+    echo "---"
+
+    # run kubeconform on template output to validate Kubernetes resources.
+    # the external schema-location allows us to validate resources for
+    # common CRDs (e.g. cert-manager resources).
+    kubeconform \
+      -schema-location default \
+      -schema-location 'https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json' \
+      -schema-location "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/{{.NormalizedKubernetesVersion}}/{{.ResourceKind}}.json" \
+      -strict \
+      -summary \
+      "$tmpFile"
+
+    echo
+    echo
+
+    rm "$tmpFile"
+  done
 done

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+externalHostname: ci.kcp.io`
	`2`	`+apiExportName: my-api`
	`3`	`+kcpKubeconfig: kcp-kubeconfig`