fix(init): use kubeadm experimental-control-plane (#194)
This commit is contained in:
Andrew Rynhard
GitHub
parent
ac0ac44706
commit
2fd7112fa7
@ -20,19 +20,14 @@ import (
|
||||
"github.com/autonomy/dianemo/src/initramfs/cmd/trustd/proto"
|
||||
"github.com/autonomy/dianemo/src/initramfs/pkg/crypto/x509"
|
||||
"github.com/autonomy/dianemo/src/initramfs/pkg/grpc/middleware/auth/basic"
|
||||
"github.com/autonomy/dianemo/src/initramfs/pkg/net"
|
||||
"github.com/autonomy/dianemo/src/initramfs/pkg/userdata"
|
||||
"github.com/containerd/containerd/oci"
|
||||
specs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
"google.golang.org/grpc"
|
||||
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
||||
)
|
||||
|
||||
const kubeadmSH = `#!/bin/bash
|
||||
|
||||
set -eEou pipefail
|
||||
|
||||
cd /etc/kubernetes
|
||||
set -e
|
||||
|
||||
apt-get update -y
|
||||
apt-get install -y curl
|
||||
@ -40,36 +35,16 @@ apt-get install -y curl
|
||||
curl -L https://download.docker.com/linux/static/stable/x86_64/docker-18.06.1-ce.tgz | tar -xz --strip-components=1 -C /bin docker/docker
|
||||
chmod +x /bin/docker
|
||||
|
||||
cd /etc/kubernetes
|
||||
|
||||
trap 'kubeadm reset --force' ERR
|
||||
|
||||
{{- if .Init }}
|
||||
{{- if eq .Init.Type "initial" }}
|
||||
{{ if .Init }}
|
||||
{{- if .Init.Bootstrap }}
|
||||
kubeadm init --config=kubeadm-config.yaml --ignore-preflight-errors=cri,kubeletversion,requiredipvskernelmodulesavailable --skip-token-print
|
||||
{{- else if eq .Init.Type "dependent" }}
|
||||
export KUBECONFIG=/etc/kubernetes/admin.conf
|
||||
kubeadm alpha phase certs all --config kubeadm-config.yaml
|
||||
kubeadm alpha phase kubelet config write-to-disk --config kubeadm-config.yaml
|
||||
kubeadm alpha phase kubelet write-env-file --config kubeadm-config.yaml
|
||||
kubeadm alpha phase kubeconfig kubelet --config kubeadm-config.yaml
|
||||
# Workaround for clusters running with the DenyEscalatingExec admission controller.
|
||||
docker run \
|
||||
--rm \
|
||||
--net=host \
|
||||
--volume /etc/kubernetes/pki/etcd:/etc/kubernetes/pki/etcd k8s.gcr.io/etcd:{{ .EtcdVersion }} \
|
||||
etcdctl \
|
||||
--ca-file /etc/kubernetes/pki/etcd/ca.crt \
|
||||
--cert-file /etc/kubernetes/pki/etcd/peer.crt \
|
||||
--key-file /etc/kubernetes/pki/etcd/peer.key \
|
||||
--endpoints=https://{{ .Init.EtcdEndpoint }}:2379 \
|
||||
member add {{ .Init.EtcdMemberName }} https://{{ .IP }}:2380
|
||||
kubeadm alpha phase etcd local --config kubeadm-config.yaml
|
||||
kubeadm alpha phase kubeconfig all --config kubeadm-config.yaml
|
||||
{{- if not .Init.SelfHosted }}
|
||||
kubeadm alpha phase controlplane all --config kubeadm-config.yaml
|
||||
{{- end }}
|
||||
kubeadm alpha phase mark-master --config kubeadm-config.yaml
|
||||
echo "successfully joined master node {{ .Hostname }}"
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
kubeadm join --config kubeadm-config.yaml --ignore-preflight-errors=cri,kubeletversion,requiredipvskernelmodulesavailable --experimental-control-plane
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
kubeadm join --config=kubeadm-config.yaml --ignore-preflight-errors=cri,kubeletversion,requiredipvskernelmodulesavailable
|
||||
{{- end }}
|
||||
@ -109,12 +84,12 @@ func (k *Kubeadm) PreFunc(data *userdata.UserData) (err error) {
|
||||
}
|
||||
|
||||
// PostFunc implements the Service interface.
|
||||
func (k *Kubeadm) PostFunc(data *userdata.UserData) (err error) {
|
||||
func (k *Kubeadm) PostFunc(data *userdata.UserData) error {
|
||||
if data.Services.Kubeadm.Init == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if data.Services.Kubeadm.Init.TrustEndpoint == "" {
|
||||
if data.Services.Kubeadm.Init.TrustEndpoints == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -124,21 +99,6 @@ func (k *Kubeadm) PostFunc(data *userdata.UserData) (err error) {
|
||||
data.Services.Trustd.Password,
|
||||
)
|
||||
|
||||
var conn *grpc.ClientConn
|
||||
parts := strings.Split(data.Services.Kubeadm.Init.TrustEndpoint, ":")
|
||||
if len(parts) != 2 {
|
||||
return fmt.Errorf("trust endpoint is not valid")
|
||||
}
|
||||
i, err := strconv.Atoi(parts[1])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
conn, err = basic.NewConnection(parts[0], i, creds)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
client := proto.NewTrustdClient(conn)
|
||||
|
||||
files := []string{
|
||||
"/var/etc/kubernetes/pki/ca.crt",
|
||||
"/var/etc/kubernetes/pki/ca.key",
|
||||
@ -150,8 +110,25 @@ func (k *Kubeadm) PostFunc(data *userdata.UserData) (err error) {
|
||||
"/var/etc/kubernetes/pki/etcd/ca.key",
|
||||
"/var/etc/kubernetes/admin.conf",
|
||||
}
|
||||
if err = writeFiles(client, files); err != nil {
|
||||
return
|
||||
|
||||
for _, endpoint := range data.Services.Kubeadm.Init.TrustEndpoints {
|
||||
parts := strings.Split(endpoint, ":")
|
||||
if len(parts) != 2 {
|
||||
return fmt.Errorf("trust endpoint is not valid: %s", endpoint)
|
||||
}
|
||||
i, err := strconv.Atoi(parts[1])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
conn, err := basic.NewConnection(parts[0], i, creds)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
client := proto.NewTrustdClient(conn)
|
||||
|
||||
if err := writeFiles(client, files); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
@ -162,16 +139,16 @@ func (k *Kubeadm) ConditionFunc(data *userdata.UserData) conditions.ConditionFun
|
||||
var conditionFunc conditions.ConditionFunc
|
||||
switch data.Services.Kubeadm.ContainerRuntime {
|
||||
case constants.ContainerRuntimeDocker:
|
||||
if data.Services.Kubeadm.Init != nil && data.Services.Kubeadm.Init.Type == constants.KubeadmInitTypeDependent {
|
||||
conditionFunc = conditions.WaitForFilesToExist(constants.ContainerRuntimeDockerSocket, "/var/etc/kubernetes/admin.conf")
|
||||
} else {
|
||||
if data.Services.Kubeadm.Init != nil && data.Services.Kubeadm.Init.Bootstrap {
|
||||
conditionFunc = conditions.WaitForFileToExist(constants.ContainerRuntimeDockerSocket)
|
||||
} else {
|
||||
conditionFunc = conditions.WaitForFilesToExist(constants.ContainerRuntimeDockerSocket, "/var/etc/kubernetes/admin.conf")
|
||||
}
|
||||
case constants.ContainerRuntimeCRIO:
|
||||
if data.Services.Kubeadm.Init != nil && data.Services.Kubeadm.Init.Type == constants.KubeadmInitTypeDependent {
|
||||
conditionFunc = conditions.WaitForFilesToExist(constants.ContainerRuntimeCRIOSocket, "/var/etc/kubernetes/admin.conf")
|
||||
} else {
|
||||
if data.Services.Kubeadm.Init != nil && data.Services.Kubeadm.Init.Bootstrap {
|
||||
conditionFunc = conditions.WaitForFileToExist(constants.ContainerRuntimeCRIOSocket)
|
||||
} else {
|
||||
conditionFunc = conditions.WaitForFilesToExist(constants.ContainerRuntimeCRIOSocket, "/var/etc/kubernetes/admin.conf")
|
||||
}
|
||||
}
|
||||
|
||||
@ -269,24 +246,10 @@ func writeKubeadmPKIFiles(data *x509.PEMEncodedCertificateAndKey) (err error) {
|
||||
}
|
||||
|
||||
func parse(data *userdata.UserData) ([]byte, error) {
|
||||
ip, err := net.IP()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
hostname, err := os.Hostname()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
aux := struct {
|
||||
IP string
|
||||
Hostname string
|
||||
Init *userdata.InitConfiguration
|
||||
EtcdVersion string
|
||||
Init *userdata.InitConfiguration
|
||||
}{
|
||||
Hostname: hostname,
|
||||
IP: ip.String(),
|
||||
Init: data.Services.Kubeadm.Init,
|
||||
EtcdVersion: kubeadmconstants.DefaultEtcdVersion,
|
||||
Init: data.Services.Kubeadm.Init,
|
||||
}
|
||||
t, err := template.New("kubeadm").Parse(kubeadmSH)
|
||||
if err != nil {
|
||||
|
||||
@ -48,7 +48,6 @@ func (s *singleton) Start(services ...Service) {
|
||||
for _, service := range services {
|
||||
go func(service Service) {
|
||||
id := service.ID(s.UserData)
|
||||
log.Printf("starting service %q", id)
|
||||
if err := service.PreFunc(s.UserData); err != nil {
|
||||
log.Printf("failed to run pre stage of service %q: %v", id, err)
|
||||
return
|
||||
@ -60,6 +59,7 @@ func (s *singleton) Start(services ...Service) {
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf("starting service %q", id)
|
||||
if err := service.Start(s.UserData); err != nil {
|
||||
log.Printf("failed to start service %q: %v", id, err)
|
||||
return
|
||||
|
||||
@ -4,8 +4,6 @@ require (
|
||||
github.com/BurntSushi/toml v0.3.0 // indirect
|
||||
github.com/Microsoft/go-winio v0.4.9 // indirect
|
||||
github.com/Microsoft/hcsshim v0.7.0 // indirect
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
|
||||
github.com/boltdb/bolt v1.3.1 // indirect
|
||||
github.com/containerd/cgroups v0.0.0-20180905221500-58556f5ad844
|
||||
github.com/containerd/containerd v1.2.0
|
||||
github.com/containerd/continuity v0.0.0-20181003075958-be9bd761db19 // indirect
|
||||
@ -20,7 +18,6 @@ require (
|
||||
github.com/docker/engine-api v0.4.0
|
||||
github.com/docker/go-connections v0.4.0 // indirect
|
||||
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad // indirect
|
||||
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 // indirect
|
||||
github.com/docker/go-units v0.3.3 // indirect
|
||||
github.com/fsnotify/fsnotify v1.4.7 // indirect
|
||||
github.com/fullsailor/pkcs7 v0.0.0-20180613152042-8306686428a5
|
||||
@ -37,14 +34,12 @@ require (
|
||||
github.com/google/uuid v1.0.0
|
||||
github.com/googleapis/gnostic v0.2.0 // indirect
|
||||
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
|
||||
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
|
||||
github.com/hashicorp/golang-lru v0.5.0 // indirect
|
||||
github.com/hpcloud/tail v1.0.0 // indirect
|
||||
github.com/imdario/mergo v0.3.6 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.0.0 // indirect
|
||||
github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect
|
||||
github.com/kubernetes-incubator/cri-o v1.11.2
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
|
||||
github.com/onsi/ginkgo v1.6.0 // indirect
|
||||
@ -56,16 +51,11 @@ require (
|
||||
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
|
||||
github.com/pkg/errors v0.8.0 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/prometheus/client_golang v0.8.0 // indirect
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 // indirect
|
||||
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e // indirect
|
||||
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273 // indirect
|
||||
github.com/sirupsen/logrus v1.0.6 // indirect
|
||||
github.com/spf13/cobra v0.0.3
|
||||
github.com/spf13/pflag v1.0.1 // indirect
|
||||
github.com/stretchr/testify v1.2.2 // indirect
|
||||
github.com/syndtr/gocapability v0.0.0-20180223013746-33e07d32887e // indirect
|
||||
go.etcd.io/bbolt v1.3.0 // indirect
|
||||
golang.org/x/crypto v0.0.0-20180515001509-1a580b3eff78 // indirect
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225
|
||||
golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced // indirect
|
||||
@ -86,6 +76,4 @@ require (
|
||||
k8s.io/api v0.0.0-20181031211151-1455c336c32a
|
||||
k8s.io/apimachinery v0.0.0-20181031012033-2e0dc82819fd
|
||||
k8s.io/client-go v9.0.0+incompatible
|
||||
k8s.io/cluster-bootstrap v0.0.0-20181031213608-96092a322233 // indirect
|
||||
k8s.io/kubernetes v1.13.0-alpha.3
|
||||
)
|
||||
|
||||
@ -4,10 +4,6 @@ github.com/Microsoft/go-winio v0.4.9 h1:3RbgqgGVqmcpbOiwrjbVtDHLlJBGF6aE+yHmNtBN
|
||||
github.com/Microsoft/go-winio v0.4.9/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
|
||||
github.com/Microsoft/hcsshim v0.7.0 h1:m1J6JDH52fG9Qjq8fznVe8PNX75RFge88bzQ8u/HFM0=
|
||||
github.com/Microsoft/hcsshim v0.7.0/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
|
||||
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
|
||||
github.com/containerd/cgroups v0.0.0-20180905221500-58556f5ad844 h1:W0F6ErEE8B84VNA5yX3sqNm0z7tivzEtvI/3DMo4Mr4=
|
||||
github.com/containerd/cgroups v0.0.0-20180905221500-58556f5ad844/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI=
|
||||
github.com/containerd/containerd v1.2.0 h1:0NP+uCCcSf7IHOEw/WE1vgcKh6DKIlTqqfh+dtoxDhw=
|
||||
@ -36,8 +32,6 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh
|
||||
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
|
||||
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad h1:VXIse57M5C6ezDuCPyq6QmMvEJ2xclYKZ35SfkXdm3E=
|
||||
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
|
||||
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 h1:yWHOI+vFjEsAakUTSrtqc/SAHrhSkmn48pqjidZX3QA=
|
||||
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
|
||||
github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
|
||||
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
|
||||
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
|
||||
@ -70,8 +64,6 @@ github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhp
|
||||
github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
|
||||
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
|
||||
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
|
||||
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
|
||||
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
|
||||
github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
|
||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||
@ -84,8 +76,6 @@ github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPU
|
||||
github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||
github.com/kubernetes-incubator/cri-o v1.11.2 h1:fFVGShhe9znd4QmLYk19zJNocapw9Mr73ISXkj+Bpes=
|
||||
github.com/kubernetes-incubator/cri-o v1.11.2/go.mod h1:iVQXkISBUrMZCggYuwSRBDDZ9XoP3WzfFFYpF+/RI8g=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
|
||||
@ -108,14 +98,6 @@ github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
|
||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_golang v0.8.0 h1:1921Yw9Gc3iSc4VQh3PIoOqgPCZS7G/4xQNVUp8Mda8=
|
||||
github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e h1:n/3MEhJQjQxrOUCzh1Y3Re6aJUUWRp2M9+Oc3eVn/54=
|
||||
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
|
||||
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273 h1:agujYaXJSxSo18YNX3jzl+4G6Bstwt+kqv47GS12uL0=
|
||||
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/sirupsen/logrus v1.0.6 h1:hcP1GmhGigz/O7h1WVUM5KklBp1JoNS9FggWKdj/j3s=
|
||||
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
||||
github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
|
||||
@ -126,8 +108,6 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/syndtr/gocapability v0.0.0-20180223013746-33e07d32887e h1:QjF5rxNgRSLHJDwKUvfYP3qOx1vTDzUi/+oSC8FXnCI=
|
||||
github.com/syndtr/gocapability v0.0.0-20180223013746-33e07d32887e/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
||||
go.etcd.io/bbolt v1.3.0 h1:oY10fI923Q5pVCVt1GBTZMn8LHo5M+RCInFpeMnV4QI=
|
||||
go.etcd.io/bbolt v1.3.0/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
|
||||
golang.org/x/crypto v0.0.0-20180515001509-1a580b3eff78 h1:uJIReYEB1ZZLarzi83Pmig1HhZ/cwFCysx05l0PFBIk=
|
||||
golang.org/x/crypto v0.0.0-20180515001509-1a580b3eff78/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225 h1:kNX+jCowfMYzvlSvJu5pQWEmyWFrBXJ3PBy10xKMXK8=
|
||||
@ -170,7 +150,3 @@ k8s.io/apimachinery v0.0.0-20181031012033-2e0dc82819fd h1:rzRDbWmTXaWr6SDV9caWzw
|
||||
k8s.io/apimachinery v0.0.0-20181031012033-2e0dc82819fd/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
|
||||
k8s.io/client-go v9.0.0+incompatible h1:/PdJjifJTjMFe0G4ESclZDcwF1+bFePTJ2xf+MXjcvs=
|
||||
k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
|
||||
k8s.io/cluster-bootstrap v0.0.0-20181031213608-96092a322233 h1:Ef/yKdP52Q9TMTRvMazfDhUqVgVvUZBXX7ShJnhsDwM=
|
||||
k8s.io/cluster-bootstrap v0.0.0-20181031213608-96092a322233/go.mod h1:iBSm2nwo3OaiuW8VDvc3ySDXK5SKfUrxwPvBloKG7zg=
|
||||
k8s.io/kubernetes v1.13.0-alpha.3 h1:vk043/s8SX9P545f65zH/uMJoXqGQq5WVpVzDqx80W8=
|
||||
k8s.io/kubernetes v1.13.0-alpha.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
|
||||
|
||||
@ -78,11 +78,8 @@ type Kubeadm struct {
|
||||
|
||||
// InitConfiguration describes the init strategy.
|
||||
type InitConfiguration struct {
|
||||
Type string `yaml:"type,omitempty"`
|
||||
TrustEndpoint string `yaml:"trustEndpoint,omitempty"`
|
||||
EtcdEndpoint string `yaml:"etcdEndpoint,omitempty"`
|
||||
EtcdMemberName string `yaml:"etcdMemberName,omitempty"`
|
||||
SelfHosted bool `yaml:"selfHosted,omitempty"`
|
||||
Bootstrap bool `yaml:"bootstrap"`
|
||||
TrustEndpoints []string `yaml:"trustEndpoints,omitempty"`
|
||||
}
|
||||
|
||||
// Trustd describes the configuration of the Root of Trust (RoT) service. The
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user