Skip to content

bootkube: decouple temporary kube-proxy from controller manager phase 2 #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Nov 1, 2018
Merged

bootkube: decouple temporary kube-proxy from controller manager phase 2 #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions pkg/asset/ignition/bootstrap/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package bootstrap

import (
"bytes"
"encoding/base64"
"encoding/json"
"fmt"
"os"
Expand Down Expand Up @@ -33,12 +34,13 @@ const (
// bootstrapTemplateData is the data to use to replace values in bootstrap
// template files.
type bootstrapTemplateData struct {
BootkubeImage string
ClusterDNSIP string
EtcdCertSignerImage string
EtcdCluster string
EtcdctlImage string
ReleaseImage string
BootkubeImage string
ClusterDNSIP string
EtcdCertSignerImage string
EtcdCluster string
EtcdctlImage string
ReleaseImage string
AdminKubeConfigBase64 string
}

// Bootstrap is an asset that generates the ignition config for bootstrap nodes.
Expand Down Expand Up @@ -75,9 +77,10 @@ func (a *Bootstrap) Dependencies() []asset.Asset {
// Generate generates the ignition config for the Bootstrap asset.
func (a *Bootstrap) Generate(dependencies asset.Parents) error {
installConfig := &installconfig.InstallConfig{}
dependencies.Get(installConfig)
adminKubeConfig := &kubeconfig.Admin{}
dependencies.Get(installConfig, adminKubeConfig)

templateData, err := a.getTemplateData(installConfig.Config)
templateData, err := a.getTemplateData(installConfig.Config, adminKubeConfig.File.Data)
if err != nil {
return errors.Wrap(err, "failed to get bootstrap templates")
}
Expand Down Expand Up @@ -133,7 +136,7 @@ func (a *Bootstrap) Files() []*asset.File {
}

// getTemplateData returns the data to use to execute bootstrap templates.
func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootstrapTemplateData, error) {
func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig, adminKubeConfig []byte) (*bootstrapTemplateData, error) {
clusterDNSIP, err := installconfig.ClusterDNSIP(installConfig)
if err != nil {
return nil, errors.Wrap(err, "failed to get ClusterDNSIP from InstallConfig")
Expand All @@ -150,12 +153,13 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootst
}

return &bootstrapTemplateData{
ClusterDNSIP: clusterDNSIP,
EtcdCertSignerImage: "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6",
EtcdctlImage: "quay.io/coreos/etcd:v3.2.14",
BootkubeImage: "quay.io/coreos/bootkube:v0.14.0",
ReleaseImage: releaseImage,
EtcdCluster: strings.Join(etcdEndpoints, ","),
ClusterDNSIP: clusterDNSIP,
EtcdCertSignerImage: "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6",
EtcdctlImage: "quay.io/coreos/etcd:v3.2.14",
BootkubeImage: "quay.io/coreos/bootkube:v0.14.0",
ReleaseImage: releaseImage,
EtcdCluster: strings.Join(etcdEndpoints, ","),
AdminKubeConfigBase64: base64.StdEncoding.EncodeToString(adminKubeConfig),
}, nil
}

Expand Down Expand Up @@ -207,6 +211,10 @@ func (a *Bootstrap) addTemporaryBootkubeFiles(templateData *bootstrapTemplateDat
ignition.FileFromString(filepath.Join(kubeProxyBootstrapDir, name), 0644, data),
)
}
a.Config.Storage.Files = append(
a.Config.Storage.Files,
ignition.FileFromString(filepath.Join(kubeProxyBootstrapDir, "kube-proxy-kubeconfig.yaml"), 0644, applyTemplateData(content.BootkubeKubeProxyKubeConfig, templateData)),
)

kubeDNSBootstrapDir := filepath.Join(rootDir, "kube-dns-operator-bootstrap")
for name, data := range content.KubeDNSBootkubeManifests {
Expand Down
16 changes: 14 additions & 2 deletions pkg/asset/ignition/bootstrap/content/bootkube_temporary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ var KubeDNSBootkubeManifests = map[string]string{
}

// BootkubeKubeDNSService is a template for kube-dns service.
var BootkubeKubeDNSService = template.Must(template.New("bootkube.sh").Parse(`
var (
BootkubeKubeDNSService = template.Must(template.New("bootkube.sh").Parse(`
apiVersion: v1
kind: Service
metadata:
Expand All @@ -43,6 +44,17 @@ spec:
targetPort: 53
`))

BootkubeKubeProxyKubeConfig = template.Must(template.New("kube-proxy-kubeconfig").Parse(`
Copy link
Contributor Author

@sttts sttts Nov 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@squeed this is for you. What should we do here? The kube-proxy is temporary and is must be decoupled from the controller manager. Hence, this temporary file.

apiVersion: v1
kind: Secret
metadata:
name: kube-proxy-kubeconfig
namespace: kube-system
data:
kubeconfig: {{ .AdminKubeConfigBase64 }}
Copy link
Member

@wking wking Nov 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to use the admin kubeconfig here (vs. the kubelet kubeconfig)? It may not be a big deal either way if we're going to drop this in the next week or so.

`))
)

const (
bootkubeKubeSystemRBACRoleBinding = `
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -122,7 +134,7 @@ spec:
- name: kubeconfig
secret:
defaultMode: 420
secretName: controller-manager-kubeconfig
secretName: kube-proxy-kubeconfig
updateStrategy:
rollingUpdate:
maxUnavailable: 1
Expand Down