chore: backport 2025-11-03 (#1218)

Author: weng271190436

.github/copilot-instructions.md

@@ -49,7 +49,6 @@ The main idea is that we are creating a multi-cluster application management sol
   - `test/apis` - The tests for the CRDs.
   - `test/upgrade` - The tests for the upgrade tests to test compatibility between versions.
   - `test/e2e` - The end to end tests for the member and hub agent.
-  - `test/integration` - The integration tests for the v1alpha1 member and hub agent.
   - `test/scheduler` - The integration tests for the scheduler.
   - `test/utils` - folder contains the utils code which is used to provide common functions for tests
 - The `tools/` folder contains client-side tools for helping manage the fleet.

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
            ## Repository upload token - get it from codecov.io. Required only for private repositories
           token: ${{ secrets.CODECOV_TOKEN }}
           ## Comma-separated list of files to upload
-          files: ./it-coverage.xml;./ut-coverage.xml
+          files: ./ut-coverage.xml
 
   e2e-tests:
     strategy:
@@ -84,13 +84,6 @@ jobs:
     ]
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
-      - name: Remove unnecessary files
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
@@ -153,15 +146,18 @@ jobs:
 
       - name: Collect logs
         if: always()
+        # Wait for a bit before log collection; this gives the agent pods some time to shut down
+        # gracefully and flush their logs.
         run: |
+          sleep 30
           make collect-e2e-logs
         env:
           KUBECONFIG: '/home/runner/.kube/config'
           LOG_DIR: 'logs-${{ matrix.customized-settings }}'
 
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: e2e-logs-${{ matrix.customized-settings }}
           path: test/e2e/logs-${{ matrix.customized-settings }}/

CLAUDE.md

@@ -209,7 +209,6 @@ All controllers follow standard Kubernetes controller patterns:
 - Custom properties supported for scheduling decisions
 
 ### Multi-API Version Support
-- v1alpha1 APIs maintained for backward compatibility  
 - v1beta1 APIs are current stable version
 - Feature flags control API version enablement
 

Makefile

@@ -55,7 +55,6 @@ MEMBER_CLUSTER_COUNT ?= 3
 ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 TOOLS_DIR := hack/tools
 TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/bin)
-CLUSTER_CONFIG := $(abspath test/e2e/v1alpha1/kind-config.yaml)
 
 # Binaries
 # Note: Need to use abspath so we can invoke these from subdirectories
@@ -174,25 +173,6 @@ fmt: $(GOIMPORTS) ## Run go fmt against code.
 vet: ## Run go vet against code.
 	go vet ./...
 
-## --------------------------------------
-## Kind
-## --------------------------------------
-
-# Note that these targets are only used for E2E tests of the v1alpha1 API.
-
-create-hub-kind-cluster:
-	kind create cluster --name $(HUB_KIND_CLUSTER_NAME) --image=$(KIND_IMAGE) --config=$(CLUSTER_CONFIG) --kubeconfig=$(KUBECONFIG)
-
-create-member-kind-cluster:
-	kind create cluster --name $(MEMBER_KIND_CLUSTER_NAME) --image=$(KIND_IMAGE) --config=$(CLUSTER_CONFIG) --kubeconfig=$(KUBECONFIG)
-
-load-hub-docker-image:
-	kind load docker-image --name $(HUB_KIND_CLUSTER_NAME) $(REGISTRY)/$(HUB_AGENT_IMAGE_NAME):$(HUB_AGENT_IMAGE_VERSION)
-
-load-member-docker-image:
-	kind load docker-image --name $(MEMBER_KIND_CLUSTER_NAME) $(REGISTRY)/$(REFRESH_TOKEN_IMAGE_NAME):$(REFRESH_TOKEN_IMAGE_VERSION)
-	kind load docker-image --name $(MEMBER_KIND_CLUSTER_NAME) $(REGISTRY)/$(MEMBER_AGENT_IMAGE_NAME):$(MEMBER_AGENT_IMAGE_VERSION)
-
 ## --------------------------------------
 ## test
 ## --------------------------------------
@@ -201,87 +181,23 @@ load-member-docker-image:
 test: manifests generate fmt vet local-unit-test integration-test ## Run tests.
 
 ##
-## workaround to bypass the pkg/controllers/workv1alpha1 tests failure
-## rollout controller tests need a bit longer to complete, so we increase the timeout
-##
-# Set up the timeout parameters as some of the test lengths have exceeded the default 10 minute mark.
+# Set up the timeout parameters as some of the tests (rollout controller) lengths have exceeded the default 10 minute mark.
 # TO-DO (chenyu1): enable parallelization for single package integration tests.
 .PHONY: local-unit-test
 local-unit-test: $(ENVTEST) ## Run tests.
 	export CGO_ENABLED=1 && \
 	export KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" && \
-	go test ./pkg/controllers/workv1alpha1 -race -coverprofile=ut-coverage.xml -covermode=atomic -v && \
-	go test `go list ./pkg/... ./cmd/... | grep -v pkg/controllers/workv1alpha1` -race -coverpkg=./...  -coverprofile=ut-coverage.xml -covermode=atomic -v -timeout=20m
+	go test `go list ./pkg/... ./cmd/...` -race -coverpkg=./...  -coverprofile=ut-coverage.xml -covermode=atomic -v -timeout=20m
 
 .PHONY: integration-test
 integration-test: $(ENVTEST) ## Run tests.
 	export CGO_ENABLED=1 && \
 	export KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" && \
 	ginkgo -v -p --race --cover --coverpkg=./pkg/scheduler/... ./test/scheduler && \
-	ginkgo -v -p --race --cover --coverpkg=./... ./test/apis/... ./test/crdinstaller && \
-	go test ./test/integration/... -coverpkg=./...  -race -coverprofile=it-coverage.xml -v
+	ginkgo -v -p --race --cover --coverpkg=./... ./test/apis/...
 
 ## local tests & e2e tests
 
-install-hub-agent-helm:
-	kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
-	helm install hub-agent ./charts/hub-agent/ \
-	--set image.pullPolicy=Never \
-	--set image.repository=$(REGISTRY)/$(HUB_AGENT_IMAGE_NAME) \
-	--set image.tag=$(HUB_AGENT_IMAGE_VERSION) \
-	--set logVerbosity=5 \
-	--set namespace=fleet-system \
-	--set enableWebhook=true \
-	--set webhookServiceName=fleetwebhook \
-	--set webhookClientConnectionType=service \
-	--set enableV1Alpha1APIs=true \
-	--set enableV1Beta1APIs=false \
-	--set enableClusterInventoryAPI=true \
-	--set logFileMaxSize=1000000
-
-.PHONY: e2e-v1alpha1-hub-kubeconfig-secret
-e2e-v1alpha1-hub-kubeconfig-secret:
-	kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
-	kubectl apply -f test/e2e/v1alpha1/hub-agent-sa-secret.yaml
-	TOKEN=$$(kubectl get secret hub-kubeconfig-secret -n fleet-system -o jsonpath='{.data.token}' | base64 -d) ;\
-	kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME) ;\
-	kubectl delete secret hub-kubeconfig-secret --ignore-not-found ;\
-	kubectl create secret generic hub-kubeconfig-secret --from-literal=token=$$TOKEN
-
-install-member-agent-helm: install-hub-agent-helm e2e-v1alpha1-hub-kubeconfig-secret
-	kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
-	## Get kind cluster IP that docker uses internally so we can talk to the other cluster. the port is the default one.
-	HUB_SERVER_URL="https://$$(docker inspect $(HUB_KIND_CLUSTER_NAME)-control-plane --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'):6443" ;\
-	kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME) ;\
-	helm install member-agent ./charts/member-agent/ \
-	--set config.hubURL=$$HUB_SERVER_URL \
-	--set image.repository=$(REGISTRY)/$(MEMBER_AGENT_IMAGE_NAME) \
-	--set image.tag=$(MEMBER_AGENT_IMAGE_VERSION) \
-	--set refreshtoken.repository=$(REGISTRY)/$(REFRESH_TOKEN_IMAGE_NAME) \
-	--set refreshtoken.tag=$(REFRESH_TOKEN_IMAGE_VERSION) \
-	--set image.pullPolicy=Never \
-	--set refreshtoken.pullPolicy=Never \
-	--set config.memberClusterName="kind-$(MEMBER_KIND_CLUSTER_NAME)" \
-	--set logVerbosity=5 \
-	--set namespace=fleet-system
-	# to make sure member-agent reads the token file.
-	kubectl delete pod --all -n fleet-system
-
-build-e2e-v1alpha1:
-	go test -c ./test/e2e/v1alpha1
-
-run-e2e-v1alpha1: build-e2e-v1alpha1
-	KUBECONFIG=$(KUBECONFIG) HUB_SERVER_URL="https://$$(docker inspect $(HUB_KIND_CLUSTER_NAME)-control-plane --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'):6443" ./v1alpha1.test -test.v -ginkgo.v
-
-.PHONY: create-kind-cluster
-create-kind-cluster: create-hub-kind-cluster create-member-kind-cluster install-helm
-
-.PHONY: install-helm
-install-helm: load-hub-docker-image load-member-docker-image install-member-agent-helm
-
-.PHONY: e2e-tests-v1alpha1
-e2e-tests-v1alpha1: create-kind-cluster run-e2e-v1alpha1
-
 # E2E test label filter (can be overridden)
 LABEL_FILTER ?= !custom
 
@@ -462,30 +378,6 @@ clean-bin: ## Remove all generated binaries
 	rm -rf $(TOOLS_BIN_DIR)
 	rm -rf ./bin
 
-# Note that these targets are only used for E2E tests of the v1alpha1 API.
-
-.PHONY: uninstall-helm
-uninstall-helm: clean-testing-resources
-	kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
-	helm uninstall hub-agent
-
-	kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME)
-	helm uninstall member-agent
-
-.PHONY: clean-testing-resources
-clean-testing-resources:
-	kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
-	kubectl delete ns fleet-member-kind-member-testing --ignore-not-found
-	kubectl delete memberclusters.fleet.azure.com kind-$(MEMBER_KIND_CLUSTER_NAME) --ignore-not-found
-
-	kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME)
-	kubectl delete ns fleet-member-kind-member-testing --ignore-not-found
-
-.PHONY: clean-e2e-tests-v1alpha1
-clean-e2e-tests-v1alpha1:
-	kind delete cluster --name $(HUB_KIND_CLUSTER_NAME)
-	kind delete cluster --name $(MEMBER_KIND_CLUSTER_NAME)
-
 .PHONY: clean-e2e-tests
 clean-e2e-tests:
 	cd ./test/e2e && chmod +x ./stop.sh && ./stop.sh $(MEMBER_CLUSTER_COUNT)

README.md

@@ -15,7 +15,44 @@ For any questions, please see the [KubeFleet discussion board](https://github.co
 For any issues, please open an issue in the [KubeFleet](https://github.com/kubefleet-dev/kubefleet/issues)
 
 
-[1]:  https://img.shields.io/github/v/release/Azure/fleet
+## Quickstart
+
+* [Get started here](https://kubefleet-dev.github.io/website/docs/getting-started/kind/)
+
+## Documentation
+
+To learn more about KubeFleet go to the [KubeFleet documentation](https://kubefleet-dev.github.io/website/).
+
+## Community
+
+You can reach the KubeFleet community and developers via the following channels:
+
+* Q & A: [GitHub Discussions](https://github.com/kubefleet-dev/kubefleet/discussions)
+* Slack: [The #KubeFleet Slack channel](https://cloud-native.slack.com/archives/C08KR7589R8) 
+* Mailing list: [mailing list](https://groups.google.com/g/kubefleet-dev)
+
+## Community Meetings
+
+We host bi-weekly community meetings that alternate between US/EU and APAC friendly time. In these sessions the community will showcase demos and discuss the current and future state of the project.
+
+Please refer to the [calendar](https://zoom-lfx.platform.linuxfoundation.org/meetings/kubefleet?view=month) for the latest schedule:
+* Wednesdays at 09:30am PT [US/EU](https://zoom-lfx.platform.linuxfoundation.org/meeting/93624014488?password=27667a5c-9238-4b5a-b4d8-96daadaa9fa4) (weekly). [Convert to your timezone](https://dateful.com/convert/pacific-time-pt?t=930am).
+* Thursday at 9:00am CST [APAC](https://zoom-lfx.platform.linuxfoundation.org/meeting/98901589453?password=9ab588fd-1214-40c3-84c2-757c124e984f) (biweekly).  [Convert to your timezone](https://dateful.com/convert/beijing-china?t=9am).
+
+For more meeting information, minutes and recordings, please see the [KubeFleet community meeting doc](https://docs.google.com/document/d/1iMcHn11fPlb9ZGoMHiGEBvdIc44W1CjZvsPH3eBg6pA/edit?usp=sharing).
+
+## Code of Conduct
+Participation in KubeFleet is governed by the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). See the [Code of Conduct](CODE_OF_CONDUCT.md) for more information.
+
+## Contributing
+
+The [contribution guide](CONTRIBUTING.md) covers everything you need to know about how you can contribute to KubeFleet.
+
+## Support
+For more information, see [SUPPORT](SUPPORT.md).
+
+
+[1]:  https://img.shields.io/github/v/release/kubefleet-dev/kubefleet
 [2]:  https://goreportcard.com/badge/go.goms.io/fleet
 [3]:  https://goreportcard.com/report/go.goms.io/fleet
 [4]:  https://codecov.io/gh/Azure/fleet/branch/main/graph/badge.svg?token=D3mtbzACjC

apis/cluster/v1/membercluster_types.go

@@ -75,7 +75,20 @@ type MemberClusterSpec struct {
 	Taints []Taint `json:"taints,omitempty"`
 }
 
-// PropertyName is the name of a cluster property; it should be a Kubernetes label name.
+// PropertyName is the name of a cluster property.
+//
+// A valid name should be a string of one or more segments, separated by slashes (/) if applicable.
+//
+// Each segment must be 63 characters or less, start and end with an alphanumeric character,
+// and can include dashes (-), underscores (_), dots (.), and alphanumerics in between.
+//
+// Optionally, the property name can have a prefix, which must be a DNS subdomain up to 253 characters,
+// followed by a slash (/).
+//
+// Examples include:
+// - "avg-resource-pressure"
+// - "kubernetes-fleet.io/node-count"
+// - "kubernetes.azure.com/vm-sizes/Standard_D2s_v3/count"
 type PropertyName string
 
 // PropertyValue is the value of a cluster property.