kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove references to api-server-specific ClusterSpec fields from nodeup

This commit is contained in:
John Gardiner Myers 2023-07-10 19:28:24 -07:00
parent 57bef1eb9c
commit 75db4d76a9
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodeup/pkg/model/kube_apiserver.go
View File

@ -394,7 +394,7 @@ func (b *KubeAPIServerBuilder) writeServerCertificate(c *fi.NodeupModelBuilderCo
"kubernetes", "kubernetes",
"kubernetes.default", "kubernetes.default",
"kubernetes.default.svc", "kubernetes.default.svc",
"kubernetes.default.svc." + b.Cluster.Spec.ClusterDNSDomain, "kubernetes.default.svc." + b.NodeupConfig.APIServerConfig.ClusterDNSDomain,
} }
// Names specified in the cluster spec // Names specified in the cluster spec
@ -741,7 +741,7 @@ func (b *KubeAPIServerBuilder) buildAnnotations() map[string]string {
annotations := make(map[string]string) annotations := make(map[string]string)
annotations["kubectl.kubernetes.io/default-container"] = "kube-apiserver" annotations["kubectl.kubernetes.io/default-container"] = "kube-apiserver"
if b.Cluster.UsesNoneDNS() { if b.NodeupConfig.UsesNoneDNS {
return annotations return annotations
} }

2
nodeup/pkg/model/kube_controller_manager.go
View File

@ -117,7 +117,7 @@ func (b *KubeControllerManagerBuilder) writeServerCertificate(c *fi.NodeupModelB
if kcm.TLSCertFile == nil { if kcm.TLSCertFile == nil {
alternateNames := []string{ alternateNames := []string{
"kube-controller-manager.kube-system.svc." + b.Cluster.Spec.ClusterDNSDomain, "kube-controller-manager.kube-system.svc." + b.NodeupConfig.APIServerConfig.ClusterDNSDomain,
} }
issueCert := &nodetasks.IssueCert{ issueCert := &nodetasks.IssueCert{

2
nodeup/pkg/model/kube_scheduler.go
View File

@ -155,7 +155,7 @@ func (b *KubeSchedulerBuilder) writeServerCertificate(c *fi.NodeupModelBuilderCo
if kubeScheduler.TLSCertFile == nil { if kubeScheduler.TLSCertFile == nil {
alternateNames := []string{ alternateNames := []string{
"kube-scheduler.kube-system.svc." + b.Cluster.Spec.ClusterDNSDomain, "kube-scheduler.kube-system.svc." + b.NodeupConfig.APIServerConfig.ClusterDNSDomain,
} }
issueCert := &nodetasks.IssueCert{ issueCert := &nodetasks.IssueCert{

5
pkg/apis/nodeup/config.go
View File

@ -168,6 +168,8 @@ type StaticManifest struct {
// APIServerConfig is additional configuration for nodes running an APIServer. // APIServerConfig is additional configuration for nodes running an APIServer.
type APIServerConfig struct { type APIServerConfig struct {
// ClusterDNSDomain is the suffix we use for internal DNS names (normally cluster.local).
ClusterDNSDomain string
// KubeAPIServer is a copy of the KubeAPIServerConfig from the cluster spec. // KubeAPIServer is a copy of the KubeAPIServerConfig from the cluster spec.
KubeAPIServer *kops.KubeAPIServerConfig KubeAPIServer *kops.KubeAPIServerConfig
// API controls how the Kubernetes API is exposed. // API controls how the Kubernetes API is exposed.
@ -299,7 +301,8 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Confi
if instanceGroup.HasAPIServer() { if instanceGroup.HasAPIServer() {
config.APIServerConfig = &APIServerConfig{ config.APIServerConfig = &APIServerConfig{
KubeAPIServer: cluster.Spec.KubeAPIServer, ClusterDNSDomain: cluster.Spec.ClusterDNSDomain,
KubeAPIServer: cluster.Spec.KubeAPIServer,
API: kops.APISpec{ API: kops.APISpec{
PublicName: cluster.Spec.API.PublicName, PublicName: cluster.Spec.API.PublicName,
AdditionalSANs: cluster.Spec.API.AdditionalSANs, AdditionalSANs: cluster.Spec.API.AdditionalSANs,