mirror of https://github.com/linkerd/linkerd2.git
parent
5b27ff02aa
commit
e281fb3410
|
@ -520,7 +520,7 @@ func (pp *portPublisher) unsubscribe(listener EndpointUpdateListener) {
|
||||||
// present. If the service is present and it has a port spec matching the
|
// present. If the service is present and it has a port spec matching the
|
||||||
// specified port and a target port configured, it returns the name of the
|
// specified port and a target port configured, it returns the name of the
|
||||||
// service's port (not the name of the target pod port), so that it can be
|
// service's port (not the name of the target pod port), so that it can be
|
||||||
// looked up in the the endpoints API response, which uses service port names.
|
// looked up in the endpoints API response, which uses service port names.
|
||||||
func getTargetPort(service *corev1.Service, port Port) namedPort {
|
func getTargetPort(service *corev1.Service, port Port) namedPort {
|
||||||
// Use the specified port as the target port by default
|
// Use the specified port as the target port by default
|
||||||
targetPort := intstr.FromInt(int(port))
|
targetPort := intstr.FromInt(int(port))
|
||||||
|
|
|
@ -92,7 +92,7 @@ const (
|
||||||
LinkerdAPIChecks CategoryID = "linkerd-api"
|
LinkerdAPIChecks CategoryID = "linkerd-api"
|
||||||
|
|
||||||
// LinkerdVersionChecks adds a series of checks to query for the latest
|
// LinkerdVersionChecks adds a series of checks to query for the latest
|
||||||
// version, and validate the the CLI is up to date.
|
// version, and validate the CLI is up to date.
|
||||||
LinkerdVersionChecks CategoryID = "linkerd-version"
|
LinkerdVersionChecks CategoryID = "linkerd-version"
|
||||||
|
|
||||||
// LinkerdControlPlaneVersionChecks adds a series of checks to validate that
|
// LinkerdControlPlaneVersionChecks adds a series of checks to validate that
|
||||||
|
@ -104,7 +104,7 @@ const (
|
||||||
LinkerdControlPlaneVersionChecks CategoryID = "control-plane-version"
|
LinkerdControlPlaneVersionChecks CategoryID = "control-plane-version"
|
||||||
|
|
||||||
// LinkerdDataPlaneChecks adds data plane checks to validate that the data
|
// LinkerdDataPlaneChecks adds data plane checks to validate that the data
|
||||||
// plane namespace exists, and that the the proxy containers are in a ready
|
// plane namespace exists, and that the proxy containers are in a ready
|
||||||
// state and running the latest available version.
|
// state and running the latest available version.
|
||||||
// These checks are dependent on the output of KubernetesAPIChecks,
|
// These checks are dependent on the output of KubernetesAPIChecks,
|
||||||
// `apiClient` from LinkerdControlPlaneExistenceChecks, and `latestVersions`
|
// `apiClient` from LinkerdControlPlaneExistenceChecks, and `latestVersions`
|
||||||
|
|
|
@ -125,7 +125,7 @@ func (conf *ResourceConfig) WithOwnerRetriever(f OwnerRetrieverFunc) *ResourceCo
|
||||||
return conf
|
return conf
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetOwnerRef returns a reference to the the resource's owner resource, if any
|
// GetOwnerRef returns a reference to the resource's owner resource, if any
|
||||||
func (conf *ResourceConfig) GetOwnerRef() *metav1.OwnerReference {
|
func (conf *ResourceConfig) GetOwnerRef() *metav1.OwnerReference {
|
||||||
return conf.workload.ownerRef
|
return conf.workload.ownerRef
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,7 +204,7 @@ func (h *TestHelper) ValidateOutput(out, fixtureFile string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckVersion validates the the output of the "linkerd version" command.
|
// CheckVersion validates the output of the "linkerd version" command.
|
||||||
func (h *TestHelper) CheckVersion(serverVersion string) error {
|
func (h *TestHelper) CheckVersion(serverVersion string) error {
|
||||||
out, _, err := h.LinkerdRun("version")
|
out, _, err := h.LinkerdRun("version")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue