Merge branch 'main' into add-jitter-to-polling

rancher · Dec 16, 2024 · 547cd2f · 547cd2f
2 parents d7a4098 + 93801e5
commit 547cd2f
Show file tree

Hide file tree

Showing 86 changed files with 7,237 additions and 670 deletions.
diff --git a/.github/scripts/deploy-fleet.sh b/.github/scripts/deploy-fleet.sh
@@ -66,6 +66,8 @@ eventually helm upgrade --install fleet charts/fleet \
   $shards_settings \
   --set-string extraEnv[0].name=EXPERIMENTAL_OCI_STORAGE \
   --set-string extraEnv[0].value=true \
+  --set-string extraEnv[1].name=EXPERIMENTAL_HELM_OPS \
+  --set-string extraEnv[1].value=true \
   --set garbageCollectionInterval=1s \
   --set debug=true --set debugLevel=1
 

diff --git a/.github/scripts/label-downstream-cluster.sh b/.github/scripts/label-downstream-cluster.sh
@@ -4,6 +4,12 @@ set -euxo pipefail
 
 ns=${FLEET_E2E_NS_DOWNSTREAM-fleet-default}
 
-{ grep -q -m 1 -e "1/1"; kill $!; } < <(kubectl get clusters.fleet.cattle.io -n "$ns" -w)
-name=$(kubectl get clusters.fleet.cattle.io -o=jsonpath='{.items[0].metadata.name}' -n "$ns")
-kubectl patch clusters.fleet.cattle.io -n "$ns" "$name" --type=json -p '[{"op": "add", "path": "/metadata/labels/env", "value": "test" }]'
+# Wait for clusters to become "ready" by waiting for bundles to become ready.
+num_clusters=$(k3d cluster list -o json | jq -r '.[].name | select( . | contains("downstream") )' | wc -l)
+while [[ $(kubectl get clusters.fleet.cattle.io -n "$ns" | grep '1/1' -c) -ne $num_clusters ]]; do
+    sleep 1
+done
+
+for cluster in $(kubectl get clusters.fleet.cattle.io -n "$ns" -o=jsonpath='{.items[*].metadata.name}'); do
+  kubectl patch clusters.fleet.cattle.io -n "$ns" "$cluster" --type=json -p '[{"op": "add", "path": "/metadata/labels/env", "value": "test" }]'
+done
diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml
@@ -98,8 +98,8 @@ jobs:
           FLEET_E2E_NS: fleet-local
         run: |
           ginkgo --github-output --label-filter='sharding' e2e/single-cluster
-          ginkgo --github-output e2e/metrics
-          SHARD=shard1 ginkgo --github-output e2e/metrics
+          ginkgo --github-output --label-filter='!oci-registry' e2e/metrics
+          SHARD=shard1 ginkgo --github-output --label-filter='!oci-registry' e2e/metrics
       -
         name: Create Zot certificates for OCI tests
         if: ${{ matrix.test_type.name == 'infra-setup' }}
@@ -134,6 +134,7 @@ jobs:
           # Run tests requiring an OCI registry
           e2e/testenv/infra/infra setup --oci-registry=true
           ginkgo --github-output --label-filter='oci-registry' e2e/single-cluster
+          ginkgo --github-output --label-filter='oci-registry' e2e/metrics
 
           e2e/testenv/infra/infra teardown
       -

diff --git a/charts/fleet-agent/templates/deployment.yaml b/charts/fleet-agent/templates/deployment.yaml
@@ -70,6 +70,8 @@ spec:
             - ALL
         {{- end }}
         volumeMounts:
+          - mountPath: /tmp
+            name: tmp
           - mountPath: /.kube
             name: kube
       - env:
@@ -97,6 +99,8 @@ spec:
             - ALL
         {{- end }}
       volumes:
+        - name: tmp
+          emptyDir: {}
         - name: kube
           emptyDir: {}
       serviceAccountName: fleet-agent

diff --git a/charts/fleet-agent/templates/validate.yaml b/charts/fleet-agent/templates/validate.yaml
@@ -1,9 +1,9 @@
 {{if ne .Release.Namespace .Values.internal.systemNamespace }}
-{{ fail (printf "This chart must be installed in the namespace %s as the release name fleet-agent" .Values.internal.systemNamespace) }}
+{{ fail (printf "This chart must be installed in the %s namespace" .Values.internal.systemNamespace) }}
 {{end}}
 
 {{if ne .Release.Name .Values.internal.managedReleaseName }}
-{{ fail (printf "This chart must be installed in the namespace %s as the release name fleet-agent" .Values.internal.managedReleaseName) }}
+{{ fail (printf "This chart must be installed with release name %s" .Values.internal.managedReleaseName) }}
 {{end}}
 
 {{if not .Values.apiServerURL }}