Rebase with upstream

Signed-off-by: gakio12 <gakio12@gmail.com>
k0sproject · Oct 6, 2021 · 4bbf01f · 4bbf01f
1 parent ecb238a
commit 4bbf01f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -140,6 +140,7 @@ func (c *CmdOpts) startController(ctx context.Context) error {
 	})
 
 	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()

diff --git a/pkg/apis/k0s.k0sproject.io/v1beta1/api.go b/pkg/apis/k0s.k0sproject.io/v1beta1/api.go
@@ -31,6 +31,9 @@ type APISpec struct {
 	// 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"`