diff --git a/.github/workflows/e2e-test-k8s.yml b/.github/workflows/e2e-test-k8s.yml index 134d60c6..f1b2cd7f 100644 --- a/.github/workflows/e2e-test-k8s.yml +++ b/.github/workflows/e2e-test-k8s.yml @@ -28,6 +28,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true +env: + ADC_VERSION: dev + jobs: e2e-test: strategy: diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 94a7b383..e512d4b6 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -28,6 +28,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true +env: + ADC_VERSION: dev + jobs: e2e-test: strategy: diff --git a/api/adc/types.go b/api/adc/types.go index 4a9720fc..1c6d46e4 100644 --- a/api/adc/types.go +++ b/api/adc/types.go @@ -198,16 +198,16 @@ type ClientTLS struct { // UpstreamActiveHealthCheck defines the active upstream health check configuration. // +k8s:deepcopy-gen=true type UpstreamActiveHealthCheck struct { - Type string `json:"type,omitempty" yaml:"type,omitempty"` - Timeout int `json:"timeout,omitempty" yaml:"timeout,omitempty"` - Concurrency int `json:"concurrency,omitempty" yaml:"concurrency,omitempty"` - Host string `json:"host,omitempty" yaml:"host,omitempty"` - Port int32 `json:"port,omitempty" yaml:"port,omitempty"` - HTTPPath string `json:"http_path,omitempty" yaml:"http_path,omitempty"` - HTTPSVerifyCert bool `json:"https_verify_cert,omitempty" yaml:"https_verify_cert,omitempty"` - HTTPRequestHeaders []string `json:"req_headers,omitempty" yaml:"req_headers,omitempty"` - Healthy UpstreamActiveHealthCheckHealthy `json:"healthy,omitempty" yaml:"healthy,omitempty"` - Unhealthy UpstreamActiveHealthCheckUnhealthy `json:"unhealthy,omitempty" yaml:"unhealthy,omitempty"` + Type string `json:"type,omitempty" yaml:"type,omitempty"` + Timeout int `json:"timeout,omitempty" yaml:"timeout,omitempty"` + Concurrency int `json:"concurrency,omitempty" yaml:"concurrency,omitempty"` + Host string `json:"host,omitempty" yaml:"host,omitempty"` + Port int32 `json:"port,omitempty" yaml:"port,omitempty"` + HTTPPath string `json:"http_path,omitempty" yaml:"http_path,omitempty"` + HTTPSVerifyCertificate bool `json:"https_verify_certificate,omitempty" yaml:"https_verify_certificate,omitempty"` + HTTPRequestHeaders []string `json:"req_headers,omitempty" yaml:"req_headers,omitempty"` + Healthy UpstreamActiveHealthCheckHealthy `json:"healthy,omitempty" yaml:"healthy,omitempty"` + Unhealthy UpstreamActiveHealthCheckUnhealthy `json:"unhealthy,omitempty" yaml:"unhealthy,omitempty"` } // UpstreamPassiveHealthCheck defines the passive health check configuration for an upstream. diff --git a/internal/adc/translator/apisixupstream.go b/internal/adc/translator/apisixupstream.go index 33e626fe..db65d855 100644 --- a/internal/adc/translator/apisixupstream.go +++ b/internal/adc/translator/apisixupstream.go @@ -323,7 +323,7 @@ func translateUpstreamActiveHealthCheck(config *apiv2.ActiveHealthCheck) (*adc.U active.HTTPRequestHeaders = config.RequestHeaders if config.StrictTLS == nil || *config.StrictTLS { - active.HTTPSVerifyCert = true + active.HTTPSVerifyCertificate = true } if config.Healthy != nil {