mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 02:33:34 +00:00
build: move e2e dependencies into e2e/go.mod
Several packages are only used while running the e2e suite. These packages are less important to update, as the they can not influence the final executable that is part of the Ceph-CSI container-image. By moving these dependencies out of the main Ceph-CSI go.mod, it is easier to identify if a reported CVE affects Ceph-CSI, or only the testing (like most of the Kubernetes CVEs). Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
committed by
mergify[bot]
parent
15da101b1b
commit
bec6090996
8
e2e/vendor/k8s.io/kubernetes/pkg/probe/OWNERS
generated
vendored
Normal file
8
e2e/vendor/k8s.io/kubernetes/pkg/probe/OWNERS
generated
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
# See the OWNERS docs at https://go.k8s.io/owners
|
||||
|
||||
approvers:
|
||||
- sig-node-approvers
|
||||
reviewers:
|
||||
- sig-node-reviewers
|
||||
labels:
|
||||
- sig/node
|
42
e2e/vendor/k8s.io/kubernetes/pkg/probe/dialer_others.go
generated
vendored
Normal file
42
e2e/vendor/k8s.io/kubernetes/pkg/probe/dialer_others.go
generated
vendored
Normal file
@ -0,0 +1,42 @@
|
||||
//go:build !windows
|
||||
// +build !windows
|
||||
|
||||
/*
|
||||
Copyright 2023 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package probe
|
||||
|
||||
import (
|
||||
"net"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
// ProbeDialer returns a dialer optimized for probes to avoid lingering sockets on TIME-WAIT state.
|
||||
// The dialer reduces the TIME-WAIT period to 1 seconds instead of the OS default of 60 seconds.
|
||||
// Using 1 second instead of 0 because SO_LINGER socket option to 0 causes pending data to be
|
||||
// discarded and the connection to be aborted with an RST rather than for the pending data to be
|
||||
// transmitted and the connection closed cleanly with a FIN.
|
||||
// Ref: https://issues.k8s.io/89898
|
||||
func ProbeDialer() *net.Dialer {
|
||||
dialer := &net.Dialer{
|
||||
Control: func(network, address string, c syscall.RawConn) error {
|
||||
return c.Control(func(fd uintptr) {
|
||||
syscall.SetsockoptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, &syscall.Linger{Onoff: 1, Linger: 1})
|
||||
})
|
||||
},
|
||||
}
|
||||
return dialer
|
||||
}
|
42
e2e/vendor/k8s.io/kubernetes/pkg/probe/dialer_windows.go
generated
vendored
Normal file
42
e2e/vendor/k8s.io/kubernetes/pkg/probe/dialer_windows.go
generated
vendored
Normal file
@ -0,0 +1,42 @@
|
||||
//go:build windows
|
||||
// +build windows
|
||||
|
||||
/*
|
||||
Copyright 2023 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package probe
|
||||
|
||||
import (
|
||||
"net"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
// ProbeDialer returns a dialer optimized for probes to avoid lingering sockets on TIME-WAIT state.
|
||||
// The dialer reduces the TIME-WAIT period to 1 seconds instead of the OS default of 60 seconds.
|
||||
// Using 1 second instead of 0 because SO_LINGER socket option to 0 causes pending data to be
|
||||
// discarded and the connection to be aborted with an RST rather than for the pending data to be
|
||||
// transmitted and the connection closed cleanly with a FIN.
|
||||
// Ref: https://issues.k8s.io/89898
|
||||
func ProbeDialer() *net.Dialer {
|
||||
dialer := &net.Dialer{
|
||||
Control: func(network, address string, c syscall.RawConn) error {
|
||||
return c.Control(func(fd uintptr) {
|
||||
syscall.SetsockoptLinger(syscall.Handle(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, &syscall.Linger{Onoff: 1, Linger: 1})
|
||||
})
|
||||
},
|
||||
}
|
||||
return dialer
|
||||
}
|
18
e2e/vendor/k8s.io/kubernetes/pkg/probe/doc.go
generated
vendored
Normal file
18
e2e/vendor/k8s.io/kubernetes/pkg/probe/doc.go
generated
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
/*
|
||||
Copyright 2015 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
// Package probe contains utilities for health probing, as well as health status information.
|
||||
package probe // import "k8s.io/kubernetes/pkg/probe"
|
141
e2e/vendor/k8s.io/kubernetes/pkg/probe/http/http.go
generated
vendored
Normal file
141
e2e/vendor/k8s.io/kubernetes/pkg/probe/http/http.go
generated
vendored
Normal file
@ -0,0 +1,141 @@
|
||||
/*
|
||||
Copyright 2015 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package http
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
utilnet "k8s.io/apimachinery/pkg/util/net"
|
||||
"k8s.io/kubernetes/pkg/probe"
|
||||
|
||||
"k8s.io/klog/v2"
|
||||
utilio "k8s.io/utils/io"
|
||||
)
|
||||
|
||||
const (
|
||||
maxRespBodyLength = 10 * 1 << 10 // 10KB
|
||||
)
|
||||
|
||||
// New creates Prober that will skip TLS verification while probing.
|
||||
// followNonLocalRedirects configures whether the prober should follow redirects to a different hostname.
|
||||
// If disabled, redirects to other hosts will trigger a warning result.
|
||||
func New(followNonLocalRedirects bool) Prober {
|
||||
tlsConfig := &tls.Config{InsecureSkipVerify: true}
|
||||
return NewWithTLSConfig(tlsConfig, followNonLocalRedirects)
|
||||
}
|
||||
|
||||
// NewWithTLSConfig takes tls config as parameter.
|
||||
// followNonLocalRedirects configures whether the prober should follow redirects to a different hostname.
|
||||
// If disabled, redirects to other hosts will trigger a warning result.
|
||||
func NewWithTLSConfig(config *tls.Config, followNonLocalRedirects bool) Prober {
|
||||
// We do not want the probe use node's local proxy set.
|
||||
transport := utilnet.SetTransportDefaults(
|
||||
&http.Transport{
|
||||
TLSClientConfig: config,
|
||||
DisableKeepAlives: true,
|
||||
Proxy: http.ProxyURL(nil),
|
||||
DisableCompression: true, // removes Accept-Encoding header
|
||||
// DialContext creates unencrypted TCP connections
|
||||
// and is also used by the transport for HTTPS connection
|
||||
DialContext: probe.ProbeDialer().DialContext,
|
||||
})
|
||||
|
||||
return httpProber{transport, followNonLocalRedirects}
|
||||
}
|
||||
|
||||
// Prober is an interface that defines the Probe function for doing HTTP readiness/liveness checks.
|
||||
type Prober interface {
|
||||
Probe(req *http.Request, timeout time.Duration) (probe.Result, string, error)
|
||||
}
|
||||
|
||||
type httpProber struct {
|
||||
transport *http.Transport
|
||||
followNonLocalRedirects bool
|
||||
}
|
||||
|
||||
// Probe returns a ProbeRunner capable of running an HTTP check.
|
||||
func (pr httpProber) Probe(req *http.Request, timeout time.Duration) (probe.Result, string, error) {
|
||||
client := &http.Client{
|
||||
Timeout: timeout,
|
||||
Transport: pr.transport,
|
||||
CheckRedirect: RedirectChecker(pr.followNonLocalRedirects),
|
||||
}
|
||||
return DoHTTPProbe(req, client)
|
||||
}
|
||||
|
||||
// GetHTTPInterface is an interface for making HTTP requests, that returns a response and error.
|
||||
type GetHTTPInterface interface {
|
||||
Do(req *http.Request) (*http.Response, error)
|
||||
}
|
||||
|
||||
// DoHTTPProbe checks if a GET request to the url succeeds.
|
||||
// If the HTTP response code is successful (i.e. 400 > code >= 200), it returns Success.
|
||||
// If the HTTP response code is unsuccessful or HTTP communication fails, it returns Failure.
|
||||
// This is exported because some other packages may want to do direct HTTP probes.
|
||||
func DoHTTPProbe(req *http.Request, client GetHTTPInterface) (probe.Result, string, error) {
|
||||
url := req.URL
|
||||
headers := req.Header
|
||||
res, err := client.Do(req)
|
||||
if err != nil {
|
||||
// Convert errors into failures to catch timeouts.
|
||||
return probe.Failure, err.Error(), nil
|
||||
}
|
||||
defer res.Body.Close()
|
||||
b, err := utilio.ReadAtMost(res.Body, maxRespBodyLength)
|
||||
if err != nil {
|
||||
if err == utilio.ErrLimitReached {
|
||||
klog.V(4).Infof("Non fatal body truncation for %s, Response: %v", url.String(), *res)
|
||||
} else {
|
||||
return probe.Failure, "", err
|
||||
}
|
||||
}
|
||||
body := string(b)
|
||||
if res.StatusCode >= http.StatusOK && res.StatusCode < http.StatusBadRequest {
|
||||
if res.StatusCode >= http.StatusMultipleChoices { // Redirect
|
||||
klog.V(4).Infof("Probe terminated redirects for %s, Response: %v", url.String(), *res)
|
||||
return probe.Warning, fmt.Sprintf("Probe terminated redirects, Response body: %v", body), nil
|
||||
}
|
||||
klog.V(4).Infof("Probe succeeded for %s, Response: %v", url.String(), *res)
|
||||
return probe.Success, body, nil
|
||||
}
|
||||
klog.V(4).Infof("Probe failed for %s with request headers %v, response body: %v", url.String(), headers, body)
|
||||
// Note: Until https://issue.k8s.io/99425 is addressed, this user-facing failure message must not contain the response body.
|
||||
failureMsg := fmt.Sprintf("HTTP probe failed with statuscode: %d", res.StatusCode)
|
||||
return probe.Failure, failureMsg, nil
|
||||
}
|
||||
|
||||
// RedirectChecker returns a function that can be used to check HTTP redirects.
|
||||
func RedirectChecker(followNonLocalRedirects bool) func(*http.Request, []*http.Request) error {
|
||||
if followNonLocalRedirects {
|
||||
return nil // Use the default http client checker.
|
||||
}
|
||||
|
||||
return func(req *http.Request, via []*http.Request) error {
|
||||
if req.URL.Hostname() != via[0].URL.Hostname() {
|
||||
return http.ErrUseLastResponse
|
||||
}
|
||||
// Default behavior: stop after 10 redirects.
|
||||
if len(via) >= 10 {
|
||||
return errors.New("stopped after 10 redirects")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
119
e2e/vendor/k8s.io/kubernetes/pkg/probe/http/request.go
generated
vendored
Normal file
119
e2e/vendor/k8s.io/kubernetes/pkg/probe/http/request.go
generated
vendored
Normal file
@ -0,0 +1,119 @@
|
||||
/*
|
||||
Copyright 2022 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package http
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/component-base/version"
|
||||
"k8s.io/kubernetes/pkg/probe"
|
||||
)
|
||||
|
||||
// NewProbeRequest returns an http.Request suitable for use as a request for a
|
||||
// probe.
|
||||
func NewProbeRequest(url *url.URL, headers http.Header) (*http.Request, error) {
|
||||
return newProbeRequest(url, headers, "probe")
|
||||
}
|
||||
|
||||
// NewRequestForHTTPGetAction returns an http.Request derived from httpGet.
|
||||
// When httpGet.Host is empty, podIP will be used instead.
|
||||
func NewRequestForHTTPGetAction(httpGet *v1.HTTPGetAction, container *v1.Container, podIP string, userAgentFragment string) (*http.Request, error) {
|
||||
scheme := strings.ToLower(string(httpGet.Scheme))
|
||||
if scheme == "" {
|
||||
scheme = "http"
|
||||
}
|
||||
|
||||
host := httpGet.Host
|
||||
if host == "" {
|
||||
host = podIP
|
||||
}
|
||||
|
||||
port, err := probe.ResolveContainerPort(httpGet.Port, container)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
path := httpGet.Path
|
||||
url := formatURL(scheme, host, port, path)
|
||||
headers := v1HeaderToHTTPHeader(httpGet.HTTPHeaders)
|
||||
|
||||
return newProbeRequest(url, headers, userAgentFragment)
|
||||
}
|
||||
|
||||
func newProbeRequest(url *url.URL, headers http.Header, userAgentFragment string) (*http.Request, error) {
|
||||
req, err := http.NewRequest("GET", url.String(), nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if headers == nil {
|
||||
headers = http.Header{}
|
||||
}
|
||||
if _, ok := headers["User-Agent"]; !ok {
|
||||
// User-Agent header was not defined, set it
|
||||
headers.Set("User-Agent", userAgent(userAgentFragment))
|
||||
}
|
||||
if _, ok := headers["Accept"]; !ok {
|
||||
// Accept header was not defined. accept all
|
||||
headers.Set("Accept", "*/*")
|
||||
} else if headers.Get("Accept") == "" {
|
||||
// Accept header was overridden but is empty. removing
|
||||
headers.Del("Accept")
|
||||
}
|
||||
req.Header = headers
|
||||
req.Host = headers.Get("Host")
|
||||
|
||||
return req, nil
|
||||
}
|
||||
|
||||
func userAgent(purpose string) string {
|
||||
v := version.Get()
|
||||
return fmt.Sprintf("kube-%s/%s.%s", purpose, v.Major, v.Minor)
|
||||
}
|
||||
|
||||
// formatURL formats a URL from args. For testability.
|
||||
func formatURL(scheme string, host string, port int, path string) *url.URL {
|
||||
u, err := url.Parse(path)
|
||||
// Something is busted with the path, but it's too late to reject it. Pass it along as is.
|
||||
//
|
||||
// This construction of a URL may be wrong in some cases, but it preserves
|
||||
// legacy prober behavior.
|
||||
if err != nil {
|
||||
u = &url.URL{
|
||||
Path: path,
|
||||
}
|
||||
}
|
||||
u.Scheme = scheme
|
||||
u.Host = net.JoinHostPort(host, strconv.Itoa(port))
|
||||
return u
|
||||
}
|
||||
|
||||
// v1HeaderToHTTPHeader takes a list of HTTPHeader <name, value> string pairs
|
||||
// and returns a populated string->[]string http.Header map.
|
||||
func v1HeaderToHTTPHeader(headerList []v1.HTTPHeader) http.Header {
|
||||
headers := make(http.Header)
|
||||
for _, header := range headerList {
|
||||
headers.Add(header.Name, header.Value)
|
||||
}
|
||||
return headers
|
||||
}
|
31
e2e/vendor/k8s.io/kubernetes/pkg/probe/probe.go
generated
vendored
Normal file
31
e2e/vendor/k8s.io/kubernetes/pkg/probe/probe.go
generated
vendored
Normal file
@ -0,0 +1,31 @@
|
||||
/*
|
||||
Copyright 2015 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package probe
|
||||
|
||||
// Result is a string used to handle the results for probing container readiness/liveness
|
||||
type Result string
|
||||
|
||||
const (
|
||||
// Success Result
|
||||
Success Result = "success"
|
||||
// Warning Result. Logically success, but with additional debugging information attached.
|
||||
Warning Result = "warning"
|
||||
// Failure Result
|
||||
Failure Result = "failure"
|
||||
// Unknown Result
|
||||
Unknown Result = "unknown"
|
||||
)
|
57
e2e/vendor/k8s.io/kubernetes/pkg/probe/util.go
generated
vendored
Normal file
57
e2e/vendor/k8s.io/kubernetes/pkg/probe/util.go
generated
vendored
Normal file
@ -0,0 +1,57 @@
|
||||
/*
|
||||
Copyright 2022 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package probe
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/util/intstr"
|
||||
)
|
||||
|
||||
func ResolveContainerPort(param intstr.IntOrString, container *v1.Container) (int, error) {
|
||||
port := -1
|
||||
var err error
|
||||
switch param.Type {
|
||||
case intstr.Int:
|
||||
port = param.IntValue()
|
||||
case intstr.String:
|
||||
if port, err = findPortByName(container, param.StrVal); err != nil {
|
||||
// Last ditch effort - maybe it was an int stored as string?
|
||||
if port, err = strconv.Atoi(param.StrVal); err != nil {
|
||||
return port, err
|
||||
}
|
||||
}
|
||||
default:
|
||||
return port, fmt.Errorf("intOrString had no kind: %+v", param)
|
||||
}
|
||||
if port > 0 && port < 65536 {
|
||||
return port, nil
|
||||
}
|
||||
return port, fmt.Errorf("invalid port number: %v", port)
|
||||
}
|
||||
|
||||
// findPortByName is a helper function to look up a port in a container by name.
|
||||
func findPortByName(container *v1.Container, portName string) (int, error) {
|
||||
for _, port := range container.Ports {
|
||||
if port.Name == portName {
|
||||
return int(port.ContainerPort), nil
|
||||
}
|
||||
}
|
||||
return 0, fmt.Errorf("port %s not found", portName)
|
||||
}
|
Reference in New Issue
Block a user