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

gcp: Update terraform rendering for HTTP Health Check

This commit is contained in:
Ciprian Hacman 2023-03-16 08:09:12 +02:00
parent dc5fa01b02
commit 1db17ab949
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/model/gcemodel/api_loadbalancer.go
View File

@ -46,9 +46,10 @@ func createPublicLB(b *APILoadBalancerBuilder, c *fi.CloudupModelBuilderContext)
c.AddTask(targetPool)
healthCheck := &gcetasks.HTTPHealthcheck{
Name: s(b.NameForHealthcheck("api")),
Port: i64(wellknownports.KubeAPIServerHealthCheck),
Lifecycle: b.Lifecycle,
Name: s(b.NameForHealthcheck("api")),
Port: i64(wellknownports.KubeAPIServerHealthCheck),
RequestPath: s("/healthz"),
Lifecycle: b.Lifecycle,
}
c.AddTask(healthCheck)

5
tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf
View File

@ -417,8 +417,9 @@ resource "google_compute_forwarding_rule" "api-minimal-gce-plb-example-com" {
}
resource "google_compute_http_health_check" "api-minimal-gce-plb-example-com" {
name = "api-minimal-gce-plb-example-com"
port = 3990
name = "api-minimal-gce-plb-example-com"
port = 3990
request_path = "/healthz"
}
resource "google_compute_instance_group_manager" "a-master-us-test1-a-minimal-gce-plb-example-com" {

24
upup/pkg/fi/cloudup/gcetasks/httphealthcheck.go
View File

@ -33,8 +33,9 @@ type HTTPHealthcheck struct {
Name *string
Lifecycle fi.Lifecycle
SelfLink string
Port *int64
SelfLink string
Port *int64
RequestPath *string
}
var _ fi.CompareWithID = &HTTPHealthcheck{}
@ -54,9 +55,10 @@ func (e *HTTPHealthcheck) Find(c *fi.CloudupContext) (*HTTPHealthcheck, error) {
return nil, fmt.Errorf("error getting HealthCheck %q: %v", name, err)
}
actual := &HTTPHealthcheck{
Name: fi.PtrTo(r.Name),
Port: fi.PtrTo(r.Port),
SelfLink: r.SelfLink,
Name: fi.PtrTo(r.Name),
Port: fi.PtrTo(r.Port),
RequestPath: fi.PtrTo(r.RequestPath),
SelfLink: r.SelfLink,
}
// System fields
actual.Lifecycle = e.Lifecycle
@ -80,7 +82,7 @@ func (h *HTTPHealthcheck) RenderGCE(t *gce.GCEAPITarget, a, e, changes *HTTPHeal
o := &compute.HttpHealthCheck{
Name: fi.ValueOf(e.Name),
Port: fi.ValueOf(e.Port),
RequestPath: "/healthz",
RequestPath: fi.ValueOf(e.RequestPath),
}
klog.V(4).Infof("Creating Healthcheck %q", o.Name)
@ -97,14 +99,16 @@ func (h *HTTPHealthcheck) RenderGCE(t *gce.GCEAPITarget, a, e, changes *HTTPHeal
}
type terraformHTTPHealthcheck struct {
Name string `cty:"name"`
Port *int64 `cty:"port"`
Name string `cty:"name"`
Port *int64 `cty:"port"`
RequestPath *string `cty:"request_path"`
}
func (_ *HTTPHealthcheck) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *HTTPHealthcheck) error {
tf := &terraformHTTPHealthcheck{
Name: *e.Name,
Port: e.Port,
Name: *e.Name,
Port: e.Port,
RequestPath: e.RequestPath,
}
return t.RenderResource("google_compute_http_health_check", *e.Name, tf)
}