diff --git a/.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh b/.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh index fc36433efc..25fcd8da63 100755 --- a/.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh +++ b/.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh @@ -20,13 +20,22 @@ kubectl config use-context k3d-upstream until helm -n cattle-fleet-system status fleet-crd | grep -q "STATUS: deployed"; do echo waiting for original fleet-crd chart to be deployed; sleep 1; done # avoid a downgrade by rancher -sed -i 's/^version: 0/version: 9000/' charts/fleet-crd/Chart.yaml +if [[ "$OSTYPE" == "darwin"* ]]; then + sed -i '' 's/^version: 0/version: 9000/' charts/fleet-crd/Chart.yaml +else + sed -i 's/^version: 0/version: 9000/' charts/fleet-crd/Chart.yaml +fi + helm upgrade fleet-crd charts/fleet-crd --wait -n cattle-fleet-system until helm -n cattle-fleet-system status fleet | grep -q "STATUS: deployed"; do echo waiting for original fleet chart to be deployed; sleep 3; done # avoid a downgrade by rancher -sed -i 's/^version: 0/version: 9000/' charts/fleet/Chart.yaml +if [[ "$OSTYPE" == "darwin"* ]]; then + sed -i '' 's/^version: 0/version: 9000/' charts/fleet-crd/Chart.yaml +else + sed -i 's/^version: 0/version: 9000/' charts/fleet-crd/Chart.yaml +fi helm upgrade fleet charts/fleet \ --reset-then-reuse-values \ diff --git a/charts/fleet/templates/service_gitops_metrics.yaml b/charts/fleet/templates/service_gitops_metrics.yaml index bb3315f5e1..7a2ea5cdda 100644 --- a/charts/fleet/templates/service_gitops_metrics.yaml +++ b/charts/fleet/templates/service_gitops_metrics.yaml @@ -21,7 +21,7 @@ spec: selector: app: gitjob {{- if empty . }} - fleet.cattle.io/shard-default: "true" + # fleet.cattle.io/shard-default: "true" {{- else }} fleet.cattle.io/shard-id: "{{ . }}" {{- end }}