From 9672da5759f72cc8310274aa6d44cf7cdd02dba8 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Mon, 14 Aug 2023 08:46:11 -0400 Subject: [PATCH] Remove networkplugin syncer bits ...from gather, show, image override et al Signed-off-by: Tom Pantelis --- internal/gather/connectivity.go | 19 ++++++--------- internal/gather/gather.go | 2 -- internal/gather/operator.go | 4 ---- internal/show/versions.go | 3 +-- pkg/cluster/info.go | 1 - pkg/diagnose/deployments.go | 7 ------ pkg/submariner/ensure.go | 5 ---- pkg/submariner/serviceaccount/ensure.go | 31 +++++-------------------- 8 files changed, 14 insertions(+), 58 deletions(-) diff --git a/internal/gather/connectivity.go b/internal/gather/connectivity.go index 8e40706af..9c4e79f46 100644 --- a/internal/gather/connectivity.go +++ b/internal/gather/connectivity.go @@ -25,14 +25,13 @@ import ( ) const ( - gatewayPodLabel = "app=submariner-gateway" - routeagentPodLabel = "app=submariner-routeagent" - globalnetPodLabel = "app=submariner-globalnet" - metricsProxyPodLabel = "app=submariner-metrics-proxy" - networkpluginSyncerPodLabel = "app=submariner-networkplugin-syncer" - addonPodLabel = "app=submariner-addon" - ovnMasterPodLabelOCP = "app=ovnkube-master" - ovnMasterPodLabelGeneric = "name=ovnkube-master" + gatewayPodLabel = "app=submariner-gateway" + routeagentPodLabel = "app=submariner-routeagent" + globalnetPodLabel = "app=submariner-globalnet" + metricsProxyPodLabel = "app=submariner-metrics-proxy" + addonPodLabel = "app=submariner-addon" + ovnMasterPodLabelOCP = "app=ovnkube-master" + ovnMasterPodLabelGeneric = "name=ovnkube-master" ) func gatherGatewayPodLogs(info *Info) { @@ -55,10 +54,6 @@ func gatherGlobalnetPodLogs(info *Info) { gatherPodLogs(globalnetPodLabel, info) } -func gatherNetworkPluginSyncerPodLogs(info *Info) { - gatherPodLogs(networkpluginSyncerPodLabel, info) -} - func gatherAddonPodLogs(info *Info) { gatherPodLogs(addonPodLabel, info) } diff --git a/internal/gather/gather.go b/internal/gather/gather.go index fcf39fe89..5a9a55a76 100644 --- a/internal/gather/gather.go +++ b/internal/gather/gather.go @@ -132,7 +132,6 @@ func gatherConnectivity(dataType string, info Info) bool { gatherRouteAgentPodLogs(&info) gatherMetricsProxyPodLogs(&info) gatherGlobalnetPodLogs(&info) - gatherNetworkPluginSyncerPodLogs(&info) gatherAddonPodLogs(&info) case Resources: gatherCNIResources(&info, info.Submariner.Status.NetworkPlugin) @@ -239,7 +238,6 @@ func gatherOperator(dataType string, info Info) bool { gatherMetricsPodDaemonSet(&info, info.OperatorNamespace()) gatherRouteAgentDaemonSet(&info, info.OperatorNamespace()) gatherGlobalnetDaemonSet(&info, info.OperatorNamespace()) - gatherNetworkPluginSyncerDeployment(&info, info.OperatorNamespace()) gatherLighthouseAgentDeployment(&info, info.OperatorNamespace()) gatherLighthouseCoreDNSDeployment(&info, info.OperatorNamespace()) default: diff --git a/internal/gather/operator.go b/internal/gather/operator.go index e56e945b2..5afa3df8d 100644 --- a/internal/gather/operator.go +++ b/internal/gather/operator.go @@ -56,10 +56,6 @@ func gatherGlobalnetDaemonSet(info *Info, namespace string) { gatherDaemonSet(info, namespace, metav1.ListOptions{LabelSelector: globalnetPodLabel}) } -func gatherNetworkPluginSyncerDeployment(info *Info, namespace string) { - gatherDeployment(info, namespace, metav1.ListOptions{LabelSelector: networkpluginSyncerPodLabel}) -} - func gatherLighthouseAgentDeployment(info *Info, namespace string) { gatherDeployment(info, namespace, metav1.ListOptions{LabelSelector: "app=submariner-lighthouse-agent"}) } diff --git a/internal/show/versions.go b/internal/show/versions.go index aa8a6152e..0b76c48c9 100644 --- a/internal/show/versions.go +++ b/internal/show/versions.go @@ -89,8 +89,7 @@ func Versions(clusterInfo *cluster.Info, _ string, status reporter.Interface) er } err = printDeploymentVersions( - clusterInfo, &printer, names.OperatorComponent, names.ServiceDiscoveryComponent, names.LighthouseCoreDNSComponent, - names.NetworkPluginSyncerComponent) + clusterInfo, &printer, names.OperatorComponent, names.ServiceDiscoveryComponent, names.LighthouseCoreDNSComponent) if err != nil { return status.Error(err, "Error retrieving Deployment versions") } diff --git a/pkg/cluster/info.go b/pkg/cluster/info.go index c1202fd5d..c4c66bec0 100644 --- a/pkg/cluster/info.go +++ b/pkg/cluster/info.go @@ -211,7 +211,6 @@ var validOverrides = []string{ names.GatewayComponent, names.RouteAgentComponent, names.GlobalnetComponent, - names.NetworkPluginSyncerComponent, names.ServiceDiscoveryComponent, names.LighthouseCoreDNSComponent, names.NettestComponent, diff --git a/pkg/diagnose/deployments.go b/pkg/diagnose/deployments.go index e1920849b..84e5191b6 100644 --- a/pkg/diagnose/deployments.go +++ b/pkg/diagnose/deployments.go @@ -29,7 +29,6 @@ import ( "github.com/submariner-io/subctl/pkg/cluster" submarinerv1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" "github.com/submariner-io/submariner/pkg/cidr" - "github.com/submariner-io/submariner/pkg/cni" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -135,12 +134,6 @@ func checkPods(clusterInfo *cluster.Info, status reporter.Interface) error { checkDaemonset(clusterInfo.ClientProducer.ForKubernetes(), constants.OperatorNamespace, "submariner-globalnet", tracker) } - // check if networkplugin syncer components are deployed and running if enabled - if clusterInfo.Submariner.Status.NetworkPlugin == cni.OVNKubernetes { - checkDeployment(clusterInfo.ClientProducer.ForKubernetes(), constants.OperatorNamespace, - "submariner-networkplugin-syncer", tracker) - } - checkDaemonset(clusterInfo.ClientProducer.ForKubernetes(), clusterInfo.Submariner.Namespace, "submariner-metrics-proxy", tracker) } diff --git a/pkg/submariner/ensure.go b/pkg/submariner/ensure.go index 3eaaacf24..ef20ca59c 100644 --- a/pkg/submariner/ensure.go +++ b/pkg/submariner/ensure.go @@ -59,11 +59,6 @@ func Ensure(ctx context.Context, status reporter.Interface, kubeClient kubernete ClusterRoleFile: embeddedyamls.Config_rbac_submariner_diagnose_ocp_cluster_role_yaml, ClusterRoleBindingFile: embeddedyamls.Config_rbac_submariner_diagnose_ocp_cluster_role_binding_yaml, }, - { - ComponentName: names.NetworkPluginSyncerComponent, - ClusterRoleFile: embeddedyamls.Config_rbac_networkplugin_syncer_ocp_cluster_role_yaml, - ClusterRoleBindingFile: embeddedyamls.Config_rbac_networkplugin_syncer_ocp_cluster_role_binding_yaml, - }, } if created, err := ocp.EnsureRBAC(ctx, dynClient, kubeClient, operatorNamespace, componentsRbac); err != nil { diff --git a/pkg/submariner/serviceaccount/ensure.go b/pkg/submariner/serviceaccount/ensure.go index fe6433bd5..5e7f79423 100644 --- a/pkg/submariner/serviceaccount/ensure.go +++ b/pkg/submariner/serviceaccount/ensure.go @@ -60,7 +60,6 @@ func Ensure(ctx context.Context, kubeClient kubernetes.Interface, namespace stri return createdSA || createdRole || createdRB || createdCR || createdCRB, nil } -//nolint:dupl // Similar code in ensureClusterRoleBindings, ensureRoles, ensureRoleBindings but not duplicated func ensureServiceAccounts(ctx context.Context, kubeClient kubernetes.Interface, namespace string) (bool, error) { createdSubmarinerSA, err := serviceaccount.EnsureFromYAML(ctx, kubeClient, namespace, embeddedyamls.Config_rbac_submariner_gateway_service_account_yaml) @@ -82,15 +81,9 @@ func ensureServiceAccounts(ctx context.Context, kubeClient kubernetes.Interface, createdDiagnoseSA, err := serviceaccount.EnsureFromYAML(ctx, kubeClient, namespace, embeddedyamls.Config_rbac_submariner_diagnose_service_account_yaml) - if err != nil { - return false, errors.Wrap(err, "error provisioning diagnose ServiceAccount resource") - } - - createdNPSyncerSA, err := serviceaccount.EnsureFromYAML(ctx, kubeClient, namespace, - embeddedyamls.Config_rbac_networkplugin_syncer_service_account_yaml) - return createdSubmarinerSA || createdRouteAgentSA || createdGlobalnetSA || createdNPSyncerSA || createdDiagnoseSA, - errors.Wrap(err, "error provisioning operator networkplugin syncer resource") + return createdSubmarinerSA || createdRouteAgentSA || createdGlobalnetSA || createdDiagnoseSA, + errors.Wrap(err, "error provisioning diagnose ServiceAccount resource") } func ensureClusterRoles(ctx context.Context, kubeClient kubernetes.Interface) (bool, error) { @@ -110,17 +103,11 @@ func ensureClusterRoles(ctx context.Context, kubeClient kubernetes.Interface) (b } createdDiagnoseCR, err := clusterrole.EnsureFromYAML(ctx, kubeClient, embeddedyamls.Config_rbac_submariner_diagnose_cluster_role_yaml) - if err != nil { - return false, errors.Wrap(err, "error provisioning diagnose ClusterRole resource") - } - createdNPSyncerCR, err := clusterrole.EnsureFromYAML(ctx, kubeClient, embeddedyamls.Config_rbac_networkplugin_syncer_cluster_role_yaml) - - return createdSubmarinerCR || createdRouteAgentCR || createdGlobalnetCR || createdNPSyncerCR || createdDiagnoseCR, - errors.Wrap(err, "error provisioning networkplugin syncer ClusterRole resource") + return createdSubmarinerCR || createdRouteAgentCR || createdGlobalnetCR || createdDiagnoseCR, + errors.Wrap(err, "error provisioning diagnose ClusterRole resource") } -//nolint:dupl // Similar code in ensureServiceAccounts, ensureRoles, ensureRoleBindings but not duplicated func ensureClusterRoleBindings(ctx context.Context, kubeClient kubernetes.Interface, namespace string) (bool, error) { createdSubmarinerCRB, err := clusterrolebinding.EnsureFromYAML(ctx, kubeClient, namespace, embeddedyamls.Config_rbac_submariner_gateway_cluster_role_binding_yaml) @@ -142,15 +129,9 @@ func ensureClusterRoleBindings(ctx context.Context, kubeClient kubernetes.Interf createdDiagnoseCRB, err := clusterrolebinding.EnsureFromYAML(ctx, kubeClient, namespace, embeddedyamls.Config_rbac_submariner_diagnose_cluster_role_binding_yaml) - if err != nil { - return false, errors.Wrap(err, "error provisioning diagnose ClusterRoleBinding resource") - } - - createdNPSyncerCRB, err := clusterrolebinding.EnsureFromYAML(ctx, kubeClient, namespace, - embeddedyamls.Config_rbac_networkplugin_syncer_cluster_role_binding_yaml) - return createdSubmarinerCRB || createdRouteAgentCRB || createdGlobalnetCRB || createdNPSyncerCRB || createdDiagnoseCRB, - errors.Wrap(err, "error provisioning networkplugin syncer ClusterRoleBinding resource") + return createdSubmarinerCRB || createdRouteAgentCRB || createdGlobalnetCRB || createdDiagnoseCRB, + errors.Wrap(err, "error provisioning diagnose ClusterRoleBinding resource") } //nolint:dupl // Similar code in ensureServiceAccounts, ensureClusterRoleBindings, ensureRoleBindings but not duplicated