Skip to content

move etcd init to init cmd #4

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
rootfs merged 1 commit into from
May 3, 2021
Merged

move etcd init to init cmd #4

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
46 changes: 36 additions & 10 deletions pkg/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ limitations under the License.
package cmd

import (
"fmt"
"os"

"github.com/spf13/cobra"

"github.com/openshift/microshift/pkg/util"
Expand Down Expand Up @@ -50,6 +53,29 @@ func initAll(args []string) error {

func initCerts() error {
// etcd
hostname, err := os.Hostname()
if err != nil {
return fmt.Errorf("failed to get hostname: %v", err)
}
// based on https://github.com/openshift/cluster-etcd-operator/blob/master/bindata/bootkube/bootstrap-manifests/etcd-member-pod.yaml#L19
if _, err := util.GenCerts("cert-file", "/etc/kubernetes/static-pod-certs/secrets/etcd-all-serving",
"etcd-serving-"+hostname+".crt", "etcd-serving-"+hostname+".key"); err != nil {
return err
}
if _, err := util.GenCerts("trusted-ca-file", "/etc/kubernetes/static-pod-certs/configmaps/etcd-serving-ca",
"ca-bundle.crt", "ca-bundle.key"); err != nil {
return err
}

if _, err := util.GenCerts("peer-cert-file", "/etc/kubernetes/static-pod-certs/secrets/etcd-all-peer",
"etcd-peer-"+hostname+".crt", "etcd-peer-"+hostname+".key"); err != nil {
return err
}
if _, err := util.GenCerts("peer-trusted-ca-file", "/etc/kubernetes/static-pod-certs/configmaps/etcd-peer-client-ca",
"ca-bundle.crt", "ca-bundle.key"); err != nil {
return err
}

// etcd-cafile: /etc/kubernetes/static-pod-resources/configmaps/etcd-serving-ca/ca-bundle.crt
if _, err := util.GenCerts("etcd-cafile", "/etc/kubernetes/static-pod-resources/configmaps/etcd-serving-ca",
"ca-bundle.crt", "ca-bundle.key"); err != nil {
Expand All @@ -66,29 +92,29 @@ func initCerts() error {
if _, err := util.GenCerts("kube-apiserver",
"/etc/kubernetes/static-pod-certs/configmaps/client-ca/",
"ca-bundle.crt",
"ca-bundle.key"); err != nil{
"ca-bundle.key"); err != nil {
return err
}
// kubelet
// kubelet-certificate-authority: /etc/kubernetes/static-pod-resources/configmaps/kubelet-serving-ca/ca-bundle.crt
if _, err := util.GenCerts("kubelet-cert",
"/etc/kubernetes/static-pod-resources/configmaps/kubelet-serving-ca",
"ca-bundle.crt",
"ca-bundle.key"); err != nil{
"ca-bundle.key"); err != nil {
return err
}
// kubelet-client-certificate: /etc/kubernetes/static-pod-resources/secrets/kubelet-client/tls.crt
if _, err := util.GenCerts("kubelet-client-certificate",
"/etc/kubernetes/static-pod-resources/secrets/kubelet-client",
"tls.crt",
"tls.key"); err != nil{
"tls.key"); err != nil {
return err
}
// kubelet-client-key: /etc/kubernetes/static-pod-resources/secrets/kubelet-client/tls.key
if _, err := util.GenCerts("/etc/kubernetes/static-pod-resources/secrets/kubelet-client/",
"/etc/kubernetes/static-pod-resources/secrets/kubelet-client",
"tls.crt",
"tls.key"); err != nil{
"tls.key"); err != nil {
return err
}
// proxy client
Expand All @@ -97,15 +123,15 @@ func initCerts() error {
if _, err := util.GenCerts("proxy-client",
"/etc/kubernetes/static-pod-certs/secrets/aggregator-client/",
"tls.crt",
"tls.key"); err != nil{
"tls.key"); err != nil {
return err
}
// request header
// requestheader-client-ca-file: /etc/kubernetes/static-pod-certs/configmaps/aggregator-client-ca/ca-bundle.crt
if _, err := util.GenCerts("requestheader-client-ca-file",
"/etc/kubernetes/static-pod-certs/configmaps/aggregator-client-ca/ca-bundle.crt",
"ca-bundle.crt",
"ca-bundle.key"); err != nil{
"ca-bundle.key"); err != nil {
return err
}
// tls
Expand All @@ -114,30 +140,30 @@ func initCerts() error {
if _, err := util.GenCerts("tls",
"/etc/kubernetes/static-pod-certs/secrets/service-network-serving-certkey",
"tls.crt",
"tls.key"); err != nil{
"tls.key"); err != nil {
return err
}
// kube-controller-manager
// root-ca-file: /etc/kubernetes/static-pod-resources/configmaps/serviceaccount-ca/ca-bundle.crt
if _, err := util.GenCerts("kube-controller-manager",
"/etc/kubernetes/static-pod-resources/configmaps/serviceaccount-ca/",
"ca-bundle.crt",
"ca-bundle.key"); err != nil{
"ca-bundle.key"); err != nil {
return err
}
// service-account-private-key-file: /etc/kubernetes/static-pod-resources/secrets/service-account-private-key/service-account.key
if _, err := util.GenCerts("service-account-private-key-file",
"/etc/kubernetes/static-pod-resources/secrets/service-account-private-key",
"service-account.crt",
"service-account.key"); err != nil{
"service-account.key"); err != nil {
return err
}
// cluster-signing-cert-file: /etc/kubernetes/static-pod-certs/secrets/csr-signer/tls.crt
// cluster-signing-key-file: /etc/kubernetes/static-pod-certs/secrets/csr-signer/tls.key
if _, err := util.GenCerts("cluster-signing-key-file",
"/etc/kubernetes/static-pod-certs/secrets/csr-signer",
"tls.crt",
"tls.key"); err != nil{
"tls.key"); err != nil {
return err
}
// kube-scheduler
Expand Down
18 changes: 0 additions & 18 deletions pkg/controllers/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,6 @@ func StartEtcd() error {
return fmt.Errorf("failed to get host IP: %v", err)
}
// based on https://github.com/openshift/cluster-etcd-operator/blob/master/bindata/bootkube/bootstrap-manifests/etcd-member-pod.yaml#L19
if _, err := util.GenCerts("cert-file", "/etc/kubernetes/static-pod-certs/secrets/etcd-all-serving",
"etcd-serving-"+hostname+".crt", "etcd-serving-"+hostname+".key"); err != nil {
return err
}
if _, err := util.GenCerts("trusted-ca-file", "/etc/kubernetes/static-pod-certs/configmaps/etcd-serving-ca",
"ca-bundle.crt", "ca-bundle.key"); err != nil {
return err
}

if _, err := util.GenCerts("peer-cert-file", "/etc/kubernetes/static-pod-certs/secrets/etcd-all-peer",
"etcd-peer-"+hostname+".crt", "etcd-peer-"+hostname+".key"); err != nil {
return err
}
if _, err := util.GenCerts("peer-trusted-ca-file", "/etc/kubernetes/static-pod-certs/configmaps/etcd-peer-client-ca",
"ca-bundle.crt", "ca-bundle.key"); err != nil {
return err
}

cfg := etcd.NewConfig()
cfg.Logger = "zap"
cfg.Dir = "/var/lib/etcd/"
Expand Down