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

Jump to bottom

tweak connectivity check names to avoid overlap #369

Merged
merged 1 commit into from Jul 20, 2020
Merged

tweak connectivity check names to avoid overlap #369

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions pkg/operator/connectivitycheckcontroller/connectivity_check_controller.go
View file
Open in desktop
Expand Up @@ -94,11 +94,11 @@ func (c *connectivityCheckController) managePodNetworkConnectivityChecks(ctx con
// each storage endpoint
templates = append(templates, getTemplatesForStorageEndpoints(operatorSpec, recorder)...)
// kas service IP
templates = append(templates, getTemplatesForKubeAPIServerService(c.serviceLister, recorder)...)
templates = append(templates, getTemplatesForKubernetesServiceMonitorService(c.serviceLister, recorder)...)
// kas default service IP
templates = append(templates, getTemplatesForKubernetesService(recorder)...)
templates = append(templates, getTemplatesForKubernetesDefaultService(recorder)...)
// each kas endpoint IP
templates = append(templates, getTemplatesForKubeAPIServerServiceEndpoints(c.endpointsLister, recorder)...)
templates = append(templates, getTemplatesForKubernetesEndpoints(c.endpointsLister, recorder)...)

pods, err := c.podLister.List(labels.Set{"apiserver": "true"}.AsSelector())
if err != nil {
Expand Down Expand Up @@ -135,26 +135,26 @@ func (c *connectivityCheckController) managePodNetworkConnectivityChecks(ctx con
}
}

func getTemplatesForKubernetesService(recorder events.Recorder) []*v1alpha1.PodNetworkConnectivityCheck {
func getTemplatesForKubernetesDefaultService(recorder events.Recorder) []*v1alpha1.PodNetworkConnectivityCheck {
var templates []*v1alpha1.PodNetworkConnectivityCheck
host := os.Getenv("KUBERNETES_SERVICE_HOST")
port := os.Getenv("KUBERNETES_SERVICE_PORT")
if len(host) == 0 || len(port) == 0 {
recorder.Warningf("EndpointDetectionFailure", "unable to determine kubernetes service endpoint: in-cluster configuration not found")
return templates
}
return append(templates, newPodNetworkProductivityCheck("kubernetes-service", net.JoinHostPort(host, port)))
return append(templates, newPodNetworkProductivityCheck("kubernetes-default-service", net.JoinHostPort(host, port)))
}

func getTemplatesForKubeAPIServerService(serviceLister corev1listers.ServiceLister, recorder events.Recorder) []*v1alpha1.PodNetworkConnectivityCheck {
func getTemplatesForKubernetesServiceMonitorService(serviceLister corev1listers.ServiceLister, recorder events.Recorder) []*v1alpha1.PodNetworkConnectivityCheck {
var templates []*v1alpha1.PodNetworkConnectivityCheck
for _, address := range listAddressesForKubeAPIServerService(serviceLister, recorder) {
templates = append(templates, newPodNetworkProductivityCheck("kube-apiserver-service", address))
for _, address := range listAddressesForKubernetesServiceMonitorService(serviceLister, recorder) {
templates = append(templates, newPodNetworkProductivityCheck("kubernetes-apiserver-service", address))
}
return templates
}

func listAddressesForKubeAPIServerService(serviceLister corev1listers.ServiceLister, recorder events.Recorder) []string {
func listAddressesForKubernetesServiceMonitorService(serviceLister corev1listers.ServiceLister, recorder events.Recorder) []string {
service, err := serviceLister.Services("openshift-kube-apiserver").Get("apiserver")
if err != nil {
recorder.Warningf("EndpointDetectionFailure", "unable to determine openshift-kube-apiserver apiserver service endpoint: %v", err)
Expand All @@ -168,10 +168,10 @@ func listAddressesForKubeAPIServerService(serviceLister corev1listers.ServiceLis
return []string{net.JoinHostPort(service.Spec.ClusterIP, "443")}
}

func getTemplatesForKubeAPIServerServiceEndpoints(endpointsLister corev1listers.EndpointsLister, recorder events.Recorder) []*v1alpha1.PodNetworkConnectivityCheck {
func getTemplatesForKubernetesEndpoints(endpointsLister corev1listers.EndpointsLister, recorder events.Recorder) []*v1alpha1.PodNetworkConnectivityCheck {
var templates []*v1alpha1.PodNetworkConnectivityCheck
for _, address := range listAddressesForKubeAPIServerServiceEndpoints(endpointsLister, recorder) {
templates = append(templates, newPodNetworkProductivityCheck("kube-apiserver-service-endpoint", address))
templates = append(templates, newPodNetworkProductivityCheck("kubernetes-apiserver-endpoint", address))
}
return templates
}
Expand Down