Skip to content

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

Merge pull request #35862 from madhusudancs/federation-kubefed-init-05

Automatic merge from submit-queue [Federation][init-05] Separate the notions of controller manager name and federation name in the controller manager deployment spec. Please review only the last commit here. This is based on PR #35861 which will be reviewed independently. Design Doc: PR #34484 cc @kubernetes/sig-cluster-federation @nikhiljindal
parents 267c7637 d70d9616
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
federation/pkg/kubefed/init/init.go
View file @ b0022fcd
...@@ -196,7 +196,7 @@ func initFederation(cmdOut io.Writer, config util.AdminConfig, cmd *cobra.Comman ...@@ -196,7 +196,7 @@ func initFederation(cmdOut io.Writer, config util.AdminConfig, cmd *cobra.Comman
} }
// 7. Create federation controller manager // 7. Create federation controller manager
_, err = createControllerManager(hostClientset, initFlags.FederationSystemNamespace, cmName, cmKubeconfigName, dnsZoneName) _, err = createControllerManager(hostClientset, initFlags.FederationSystemNamespace, initFlags.Name, cmName, cmKubeconfigName, dnsZoneName)
if err != nil { if err != nil {
return err return err
} }
...@@ -456,10 +456,10 @@ func createAPIServer(clientset *client.Clientset, namespace, name, credentialsNa ...@@ -456,10 +456,10 @@ func createAPIServer(clientset *client.Clientset, namespace, name, credentialsNa
return clientset.Extensions().Deployments(namespace).Create(dep) return clientset.Extensions().Deployments(namespace).Create(dep)
} }
func createControllerManager(clientset *client.Clientset, namespace, name, kubeconfigName, dnsZoneName string) (*extensions.Deployment, error) { func createControllerManager(clientset *client.Clientset, namespace, name, cmName, kubeconfigName, dnsZoneName string) (*extensions.Deployment, error) {
dep := &extensions.Deployment{ dep := &extensions.Deployment{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: name, Name: cmName,
Namespace: namespace, Namespace: namespace,
Labels: componentLabel, Labels: componentLabel,
}, },
...@@ -467,7 +467,7 @@ func createControllerManager(clientset *client.Clientset, namespace, name, kubec ...@@ -467,7 +467,7 @@ func createControllerManager(clientset *client.Clientset, namespace, name, kubec
Replicas: 1, Replicas: 1,
Template: api.PodTemplateSpec{ Template: api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: name, Name: cmName,
Labels: controllerManagerPodLabels, Labels: controllerManagerPodLabels,
}, },
Spec: api.PodSpec{ Spec: api.PodSpec{
......
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