Skip to content

move singletenantcontroller to nested kubecontroller package and rename #1493

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

Merged
merged 1 commit into from
Jul 28, 2022
Merged

move singletenantcontroller to nested kubecontroller package and rename #1493

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cns/singletenantcontroller/conversion.go → ...ontroller/nodenetworkconfig/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kubecontroller
package nodenetworkconfig

import (
"net"
Expand Down
2 changes: 1 addition & 1 deletion ...singletenantcontroller/conversion_test.go → ...ller/nodenetworkconfig/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kubecontroller
package nodenetworkconfig

import (
"strconv"
Expand Down
2 changes: 1 addition & 1 deletion cns/singletenantcontroller/metrics.go → ...becontroller/nodenetworkconfig/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kubecontroller
package nodenetworkconfig

import (
"github.com/prometheus/client_golang/prometheus"
Expand Down
2 changes: 1 addition & 1 deletion cns/singletenantcontroller/reconciler.go → ...ontroller/nodenetworkconfig/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kubecontroller
package nodenetworkconfig

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion ...singletenantcontroller/reconciler_test.go → ...ller/nodenetworkconfig/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kubecontroller
package nodenetworkconfig

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion cns/singletenantcontroller/scopedclient.go → ...troller/nodenetworkconfig/scopedclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kubecontroller
package nodenetworkconfig

import (
"context"
Expand Down
10 changes: 5 additions & 5 deletions cns/service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import (
"github.com/Azure/azure-container-networking/cns/healthserver"
"github.com/Azure/azure-container-networking/cns/hnsclient"
"github.com/Azure/azure-container-networking/cns/ipampool"
nncctrl "github.com/Azure/azure-container-networking/cns/kubecontroller/nodenetworkconfig"
"github.com/Azure/azure-container-networking/cns/logger"
"github.com/Azure/azure-container-networking/cns/multitenantcontroller"
"github.com/Azure/azure-container-networking/cns/multitenantcontroller/multitenantoperator"
"github.com/Azure/azure-container-networking/cns/nmagent"
"github.com/Azure/azure-container-networking/cns/restserver"
kubecontroller "github.com/Azure/azure-container-networking/cns/singletenantcontroller"
cnstypes "github.com/Azure/azure-container-networking/cns/types"
"github.com/Azure/azure-container-networking/cns/wireserver"
acn "github.com/Azure/azure-container-networking/common"
Expand Down Expand Up @@ -910,9 +910,9 @@ func reconcileInitialCNSState(ctx context.Context, cli nodeNetworkConfigGetter,

switch nnc.Status.NetworkContainers[i].AssignmentMode { //nolint:exhaustive // skipping dynamic case
case v1alpha.Static:
ncRequest, err = kubecontroller.CreateNCRequestFromStaticNC(nnc.Status.NetworkContainers[i])
ncRequest, err = nncctrl.CreateNCRequestFromStaticNC(nnc.Status.NetworkContainers[i])
default: // For backward compatibility, default will be treated as Dynamic too.
ncRequest, err = kubecontroller.CreateNCRequestFromDynamicNC(nnc.Status.NetworkContainers[i])
ncRequest, err = nncctrl.CreateNCRequestFromDynamicNC(nnc.Status.NetworkContainers[i])
}

if err != nil {
Expand Down Expand Up @@ -999,7 +999,7 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
return errors.Wrap(err, "failed to create NNC client")
}
// TODO(rbtr): nodename and namespace should be in the cns config
scopedcli := kubecontroller.NewScopedClient(nnccli, types.NamespacedName{Namespace: "kube-system", Name: nodeName})
scopedcli := nncctrl.NewScopedClient(nnccli, types.NamespacedName{Namespace: "kube-system", Name: nodeName})

// initialize the ipam pool monitor
poolOpts := ipampool.Options{
Expand Down Expand Up @@ -1076,7 +1076,7 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
return errors.Wrapf(err, "failed to get node %s", nodeName)
}

reconciler := kubecontroller.NewReconciler(httpRestServiceImplementation, nnccli, poolMonitor)
reconciler := nncctrl.NewReconciler(httpRestServiceImplementation, nnccli, poolMonitor)
// pass Node to the Reconciler for Controller xref
if err := reconciler.SetupWithManager(manager, node); err != nil {
return errors.Wrapf(err, "failed to setup reconciler with manager")
Expand Down