Skip to content
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

clustermesh: fix hardcode at service type #2230

Merged
merged 1 commit into from
Jan 11, 2024
Merged

clustermesh: fix hardcode at service type #2230

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
10 changes: 5 additions & 5 deletions clustermesh/clustermesh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (k *K8sClusterMesh) generateService() (*corev1.Service, error) {
}

if k.params.ServiceType != "" {
if k.params.ServiceType == "NodePort" {
if corev1.ServiceType(k.params.ServiceType) == corev1.ServiceTypeNodePort {
k.Log("⚠️ Using service type NodePort may fail when nodes are removed from the cluster!")
}
svc.Spec.Type = corev1.ServiceType(k.params.ServiceType)
Expand Down Expand Up @@ -1977,7 +1977,7 @@ func generateEnableHelmValues(params Parameters, flavor k8s.Flavor) (map[string]
log("🔮 Auto-exposing service within GCP VPC (cloud.google.com/load-balancer-type=Internal)")
helmVals["clustermesh"].(map[string]interface{})["apiserver"] = map[string]interface{}{
"service": map[string]interface{}{
"type": "LoadBalancer",
"type": corev1.ServiceTypeLoadBalancer,
"annotations": map[string]interface{}{
"cloud.google.com/load-balancer-type": "Internal",
// Allows cross-region access
Expand All @@ -1989,7 +1989,7 @@ func generateEnableHelmValues(params Parameters, flavor k8s.Flavor) (map[string]
log("🔮 Auto-exposing service within Azure VPC (service.beta.kubernetes.io/azure-load-balancer-internal)")
helmVals["clustermesh"].(map[string]interface{})["apiserver"] = map[string]interface{}{
"service": map[string]interface{}{
"type": "LoadBalancer",
"type": corev1.ServiceTypeLoadBalancer,
"annotations": map[string]interface{}{
"service.beta.kubernetes.io/azure-load-balancer-internal": "true",
},
Expand All @@ -1999,7 +1999,7 @@ func generateEnableHelmValues(params Parameters, flavor k8s.Flavor) (map[string]
log("🔮 Auto-exposing service within AWS VPC (service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0")
helmVals["clustermesh"].(map[string]interface{})["apiserver"] = map[string]interface{}{
"service": map[string]interface{}{
"type": "LoadBalancer",
"type": corev1.ServiceTypeLoadBalancer,
"annotations": map[string]interface{}{
"service.beta.kubernetes.io/aws-load-balancer-internal": "0.0.0.0/0",
},
Expand All @@ -2009,7 +2009,7 @@ func generateEnableHelmValues(params Parameters, flavor k8s.Flavor) (map[string]
return nil, fmt.Errorf("cannot auto-detect service type, please specify using '--service-type' option")
}
} else {
if params.ServiceType == "NodePort" {
if corev1.ServiceType(params.ServiceType) == corev1.ServiceTypeNodePort {
log("⚠️ Using service type NodePort may fail when nodes are removed from the cluster!")
}
helmVals["clustermesh"].(map[string]interface{})["apiserver"] = map[string]interface{}{
Expand Down