Rebase with upstream

Signed-off-by: gakio12 <gakio12@gmail.com>
k0sproject · Oct 6, 2021 · 65d7ef4 · 65d7ef4
1 parent 3fdd560
commit 65d7ef4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -139,18 +139,11 @@ func (c *CmdOpts) startController(ctx context.Context) error {
 		K0sVars:     c.K0sVars,
 	})
 
-<<<<<<< HEAD
 	logrus.Infof("using api address: %s", c.NodeConfig.Spec.API.Address)
+	logrus.Infof("using api bind-address: %s", c.NodeConfig.Spec.API.BindAddress)
 	logrus.Infof("using listen port: %d", c.NodeConfig.Spec.API.Port)
 	logrus.Infof("using sans: %s", c.NodeConfig.Spec.API.SANs)
 	dnsAddress, err := c.NodeConfig.Spec.Network.DNSAddress()
-=======
-	logrus.Infof("using api address: %s", c.ClusterConfig.Spec.API.Address)
-	logrus.Infof("using api bind-address: %s", c.ClusterConfig.Spec.API.BindAddress)
-	logrus.Infof("using listen port: %d", c.ClusterConfig.Spec.API.Port)
-	logrus.Infof("using sans: %s", c.ClusterConfig.Spec.API.SANs)
-	dnsAddress, err := c.ClusterConfig.Spec.Network.DNSAddress()
->>>>>>> Add spec.api.bindAddress configuration
 	if err != nil {
 		return err
 	}

diff --git a/pkg/apis/k0s.k0sproject.io/v1beta1/api.go b/pkg/apis/k0s.k0sproject.io/v1beta1/api.go
@@ -28,10 +28,12 @@ var _ Validateable = (*APISpec)(nil)
 
 // APISpec defines the settings for the K0s API
 type APISpec struct {
-<<<<<<< HEAD:pkg/apis/k0s.k0sproject.io/v1beta1/api.go
 	// Local address on which to bind an API
 	Address string `json:"address"`
 
+	// Local address on which to bind the kube-apiserver. Defaults to 0.0.0.0.
+	BindAddress string `json:"bindAddress,omitempty"`
+
 	// The loadbalancer address (for k0s controllers running behind a loadbalancer)
 	ExternalAddress string `json:"externalAddress,omitempty"`
 
@@ -45,15 +47,6 @@ type APISpec struct {
 
 	// List of additional addresses to push to API servers serving the certificate
 	SANs []string `json:"sans"`
-=======
-	Address         string            `yaml:"address"`
-	Port            int               `yaml:"port"`
-	BindAddress     string            `yaml:"bindAddress,omitempty"`
-	K0sAPIPort      int               `yaml:"k0sApiPort,omitempty"`
-	ExternalAddress string            `yaml:"externalAddress,omitempty"`
-	SANs            []string          `yaml:"sans"`
-	ExtraArgs       map[string]string `yaml:"extraArgs,omitempty"`
->>>>>>> Add spec.api.bindAddress configuration:pkg/apis/v1beta1/api.go
 }
 
 // DefaultAPISpec default settings for api