Skip to content

K
k3s
Commit b437787a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #41872 from madhusudancs/fed-host-dns-rebase-fix

Automatic merge from submit-queue (batch tested with PRs 38702, 41810, 41778, 41858, 41872) Remove changes that accidentally sneaked in during a rebase. ```release-note NONE ```
parents ac293b85 80d946dc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 9 deletions
federation/cluster/common.sh
View file @ b437787a
...@@ -106,15 +106,6 @@ KUBE_BUILD_STAGE=${KUBE_BUILD_STAGE:-release-stage} ...@@ -106,15 +106,6 @@ KUBE_BUILD_STAGE=${KUBE_BUILD_STAGE:-release-stage}
source "${KUBE_ROOT}/cluster/common.sh" source "${KUBE_ROOT}/cluster/common.sh"
# kubefed configuration
FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-e2e-federation}"
HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-${1}}"
# kube-dns configuration.
KUBEDNS_CONFIGMAP_NAME="kube-dns"
KUBEDNS_CONFIGMAP_NAMESPACE="kube-system"
KUBEDNS_FEDERATION_FLAG="federations"
host_kubectl="${KUBE_ROOT}/cluster/kubectl.sh --namespace=${FEDERATION_NAMESPACE}" host_kubectl="${KUBE_ROOT}/cluster/kubectl.sh --namespace=${FEDERATION_NAMESPACE}"
# required: # required:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment