github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42365 from madhusudancs/fed-kubefed-remove-joinunjoin-kubedns

Browse Source 
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:
Kubernetes Submit Queue 2017-03-03 09:24:40 -08:00 committed by GitHub
commit 083a00dbea
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
federation/cluster/federation-down.sh
View File

@ -33,17 +33,6 @@ function unjoin_clusters() {
"${context}" \ "${context}" \
--context="${FEDERATION_KUBE_CONTEXT}" \ --context="${FEDERATION_KUBE_CONTEXT}" \
--host-cluster-context="${HOST_CLUSTER_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 done
} }

12
federation/cluster/federation-up.sh
View File

@ -101,18 +101,6 @@ function join_clusters() {
--host-cluster-context="${HOST_CLUSTER_CONTEXT}" \ --host-cluster-context="${HOST_CLUSTER_CONTEXT}" \
--context="${FEDERATION_NAME}" \ --context="${FEDERATION_NAME}" \
--secret-name="${context//_/-}" # Replace "_" by "-" --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 done
} }