mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-10-31 10:18:13 +00:00 
			
		
		
		
	Merge pull request #42365 from madhusudancs/fed-kubefed-remove-joinunjoin-kubedns
Automatic merge from submit-queue (batch tested with PRs 42365, 42429, 41770, 42018, 35055)
Remove kube-dns ConfigMap modification code from federation-{up,down}.sh scripts
PR #39338 has merged now. This shouldn't be necessary. This unbreaks federation tests.
```release-note
NONE
```
			
			
This commit is contained in:
		| @@ -33,17 +33,6 @@ function unjoin_clusters() { | ||||
|         "${context}" \ | ||||
|         --context="${FEDERATION_KUBE_CONTEXT}" \ | ||||
|         --host-cluster-context="${HOST_CLUSTER_CONTEXT}" | ||||
|  | ||||
|     # Delete kube-dns configmap that contains federation | ||||
|     # configuration from each cluster. | ||||
|     # TODO: This shouldn't be required after | ||||
|     # https://github.com/kubernetes/kubernetes/pull/39338. | ||||
|     # Remove this after the PR is merged. | ||||
|     kube::log::status "Deleting \"kube-dns\" ConfigMap from \"kube-system\" namespace in cluster \"${context}\"" | ||||
|     "${KUBE_ROOT}/cluster/kubectl.sh" delete configmap \ | ||||
|         --context="${context}" \ | ||||
|         --namespace="${KUBEDNS_CONFIGMAP_NAMESPACE}" \ | ||||
|         "${KUBEDNS_CONFIGMAP_NAME}" | ||||
|   done | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -101,18 +101,6 @@ function join_clusters() { | ||||
|         --host-cluster-context="${HOST_CLUSTER_CONTEXT}" \ | ||||
|         --context="${FEDERATION_NAME}" \ | ||||
|         --secret-name="${context//_/-}"    # Replace "_" by "-" | ||||
|  | ||||
|     # Create kube-dns configmap in each cluster for kube-dns to accept | ||||
|     # federation queries. | ||||
|     # TODO: This shouldn't be required after | ||||
|     # https://github.com/kubernetes/kubernetes/pull/39338. | ||||
|     # Remove this after the PR is merged. | ||||
|     kube::log::status "Creating \"kube-dns\" ConfigMap in \"kube-system\" namespace in cluster \"${context}\"" | ||||
|     "${KUBE_ROOT}/cluster/kubectl.sh" create configmap \ | ||||
|         --context="${context}" \ | ||||
|         --namespace="${KUBEDNS_CONFIGMAP_NAMESPACE}" \ | ||||
|         "${KUBEDNS_CONFIGMAP_NAME}" \ | ||||
|         --from-literal="${KUBEDNS_FEDERATION_FLAG}"="${FEDERATIONS_DOMAIN_MAP}" | ||||
|   done | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Kubernetes Submit Queue
					Kubernetes Submit Queue