Merge branch 'master' into feature/lint-disclosures

Azure · Jul 15, 2021 · da1d489 · da1d489
2 parents 4dca5a9 + 02973a1
commit da1d489
Show file tree

Hide file tree

Showing 104 changed files with 1,659 additions and 545 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.13.7 as builder
+FROM golang:1.16 as builder
 
 WORKDIR /workspace/
 # Copy the Go Modules manifests

diff --git a/api/v1alpha1/suite_test.go b/api/v1alpha1/suite_test.go
@@ -39,7 +39,11 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+	zaplogger := zap.New(func(o *zap.Options) {
+		o.DestWriter = GinkgoWriter
+		o.Development = true
+	})
+	logf.SetLogger(zaplogger)
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -73,10 +73,10 @@ steps:
 
 
   - task: GoTool@0
-    displayName: Get Go 1.13.7
+    displayName: Get Go 1.16
     condition: or(eq(variables['check_changes.SOURCE_CODE_CHANGED'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     inputs:
-      version: '1.13.7'
+      version: '1.16'
 
   - task: Go@0
     displayName: Get Go dependencies

diff --git a/controllers/apimgmt_controller.go b/controllers/apimgmt_controller.go
@@ -5,20 +5,26 @@ package controllers
 
 import (
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
+
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 // APIMAPIReconciler reconciles a APIM object
 type APIMAPIReconciler struct {
 	Reconciler *AsyncReconciler
 }
 
+var _ reconcile.Reconciler = &APIMAPIReconciler{}
+
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=apimgmtapis,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={apimgmtapis/status,apimgmtapis/finalizers},verbs=get;update;patch
 
 // Reconcile attempts to set the desired state snapshot representation of the service in k8s
-func (r *APIMAPIReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.APIMgmtAPI{})
+func (r *APIMAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.APIMgmtAPI{})
 }
 
 // SetupWithManager initializes the control loop for this operator

diff --git a/controllers/apimservice_controller.go b/controllers/apimservice_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
@@ -18,8 +20,8 @@ type ApimServiceReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={apimservices/status,apimservices/finalizers},verbs=get;update;patch
 
 // Reconcile function does the main reconciliation loop of the operator
-func (r *ApimServiceReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.ApimService{})
+func (r *ApimServiceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.ApimService{})
 }
 
 // SetupWithManager function sets up the functions with the controller

diff --git a/controllers/appinsights_controller.go b/controllers/appinsights_controller.go
@@ -5,6 +5,9 @@ package controllers
 
 import (
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
+
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -17,8 +20,8 @@ type AppInsightsReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={appinsights/status,appinsights/finalizers},verbs=get;update;patch
 
 // Reconcile attempts to set the desired state snapshot representation of the service in k8s
-func (r *AppInsightsReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AppInsights{})
+func (r *AppInsightsReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AppInsights{})
 }
 
 // SetupWithManager initializes the control loop for this operator

diff --git a/controllers/appinsightsapikey_controller.go b/controllers/appinsightsapikey_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
@@ -17,8 +19,8 @@ type AppInsightsApiKeyReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=appinsightsapikeys,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={appinsightsapikeys/status,appinsightsapikeys/finalizers},verbs=get;update;patch
 
-func (r *AppInsightsApiKeyReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AppInsightsApiKey{})
+func (r *AppInsightsApiKeyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AppInsightsApiKey{})
 }
 
 func (r *AppInsightsApiKeyReconciler) SetupWithManager(mgr ctrl.Manager) error {

diff --git a/controllers/async_controller.go b/controllers/async_controller.go
@@ -9,12 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Azure/azure-service-operator/pkg/resourcemanager"
-	"github.com/Azure/azure-service-operator/pkg/resourcemanager/config"
-	"github.com/Azure/azure-service-operator/pkg/secrets"
-	keyvaultsecretlib "github.com/Azure/azure-service-operator/pkg/secrets/keyvault"
-	telemetry "github.com/Azure/azure-service-operator/pkg/telemetry"
-	multierror "github.com/hashicorp/go-multierror"
+	"github.com/hashicorp/go-multierror"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -23,6 +18,12 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	"github.com/Azure/azure-service-operator/pkg/resourcemanager"
+	"github.com/Azure/azure-service-operator/pkg/resourcemanager/config"
+	"github.com/Azure/azure-service-operator/pkg/secrets"
+	keyvaultsecretlib "github.com/Azure/azure-service-operator/pkg/secrets/keyvault"
+	"github.com/Azure/azure-service-operator/pkg/telemetry"
 )
 
 const (
@@ -44,8 +45,8 @@ type AsyncReconciler struct {
 }
 
 // Reconcile reconciles the change request
-func (r *AsyncReconciler) Reconcile(req ctrl.Request, obj runtime.Object) (result ctrl.Result, err error) {
-	ctx, cancel := context.WithTimeout(context.Background(), reconcileTimeout)
+func (r *AsyncReconciler) Reconcile(ctx context.Context, req ctrl.Request, obj client.Object) (result ctrl.Result, err error) {
+	ctx, cancel := context.WithTimeout(ctx, reconcileTimeout)
 	defer cancel()
 
 	if err := r.Get(ctx, req.NamespacedName, obj); err != nil {

diff --git a/controllers/azureloadbalancer_controller.go b/controllers/azureloadbalancer_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
@@ -17,8 +19,8 @@ type AzureLoadBalancerReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=azureloadbalancers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azureloadbalancers/status,azureloadbalancers/finalizers},verbs=get;update;patch
 
-func (r *AzureLoadBalancerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AzureLoadBalancer{})
+func (r *AzureLoadBalancerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AzureLoadBalancer{})
 }
 
 func (r *AzureLoadBalancerReconciler) SetupWithManager(mgr ctrl.Manager) error {

diff --git a/controllers/azurenetworkinterface_controller.go b/controllers/azurenetworkinterface_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
@@ -17,8 +19,8 @@ type AzureNetworkInterfaceReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=azurenetworkinterfaces,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azurenetworkinterfaces/status,azurenetworkinterfaces/finalizers},verbs=get;update;patch
 
-func (r *AzureNetworkInterfaceReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AzureNetworkInterface{})
+func (r *AzureNetworkInterfaceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AzureNetworkInterface{})
 }
 
 func (r *AzureNetworkInterfaceReconciler) SetupWithManager(mgr ctrl.Manager) error {

diff --git a/controllers/azurepublicipaddress_controller.go b/controllers/azurepublicipaddress_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
@@ -17,8 +19,8 @@ type AzurePublicIPAddressReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=azurepublicipaddresses,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azurepublicipaddresses/status,azurepublicipaddresses/finalizers},verbs=get;update;patch
 
-func (r *AzurePublicIPAddressReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AzurePublicIPAddress{})
+func (r *AzurePublicIPAddressReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AzurePublicIPAddress{})
 }
 
 func (r *AzurePublicIPAddressReconciler) SetupWithManager(mgr ctrl.Manager) error {

diff --git a/controllers/azuresqlaction_controller.go b/controllers/azuresqlaction_controller.go
@@ -5,6 +5,9 @@ package controllers
 
 import (
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
+
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -17,8 +20,8 @@ type AzureSqlActionReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azuresqlactions/status,azuresqlactions/finalizers},verbs=get;update;patch
 
 // Reconcile function runs the actual reconcilation loop of the controller
-func (r *AzureSqlActionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AzureSqlAction{})
+func (r *AzureSqlActionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AzureSqlAction{})
 }
 
 func (r *AzureSqlActionReconciler) SetupWithManager(mgr ctrl.Manager) error {

diff --git a/controllers/azuresqldatabase_controller.go b/controllers/azuresqldatabase_controller.go
@@ -5,6 +5,9 @@ package controllers
 
 import (
 	"github.com/Azure/azure-service-operator/api/v1beta1"
+
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -17,8 +20,8 @@ type AzureSqlDatabaseReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azuresqldatabases/status,azuresqldatabases/finalizers},verbs=get;update;patch
 
 // Reconcile function does the main reconciliation loop of the operator
-func (r *AzureSqlDatabaseReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &v1beta1.AzureSqlDatabase{})
+func (r *AzureSqlDatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &v1beta1.AzureSqlDatabase{})
 }
 
 // SetupWithManager function sets up the functions with the controller

diff --git a/controllers/azuresqlfailovergroup_controller.go b/controllers/azuresqlfailovergroup_controller.go
@@ -5,6 +5,9 @@ package controllers
 
 import (
 	"github.com/Azure/azure-service-operator/api/v1beta1"
+
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -17,8 +20,8 @@ type AzureSqlFailoverGroupReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azuresqlfailovergroups/status,azuresqlfailovergroups/finalizers},verbs=get;update;patch
 
 // Reconcile function does the main reconciliation loop of the operator
-func (r *AzureSqlFailoverGroupReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &v1beta1.AzureSqlFailoverGroup{})
+func (r *AzureSqlFailoverGroupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &v1beta1.AzureSqlFailoverGroup{})
 }
 
 func (r *AzureSqlFailoverGroupReconciler) SetupWithManager(mgr ctrl.Manager) error {

diff --git a/controllers/azuresqlfirewallrule_controller.go b/controllers/azuresqlfirewallrule_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/Azure/azure-service-operator/api/v1beta1"
@@ -18,8 +20,8 @@ type AzureSqlFirewallRuleReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azuresqlfirewallrules/status,azuresqlfirewallrules/finalizers},verbs=get;update;patch
 
 // Reconcile function does the main reconciliation loop of the operator
-func (r *AzureSqlFirewallRuleReconciler) Reconcile(req ctrl.Request) (result ctrl.Result, err error) {
-	return r.Reconciler.Reconcile(req, &v1beta1.AzureSqlFirewallRule{})
+func (r *AzureSqlFirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
+	return r.Reconciler.Reconcile(ctx, req, &v1beta1.AzureSqlFirewallRule{})
 }
 
 // SetupWithManager function sets up the functions with the controller

diff --git a/controllers/azuresqlmanageduser_controller.go b/controllers/azuresqlmanageduser_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
@@ -17,8 +19,8 @@ type AzureSQLManagedUserReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=azuresqlmanagedusers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azuresqlmanagedusers/status,azuresqlmanagedusers/finalizers},verbs=get;update;patch
 
-func (r *AzureSQLManagedUserReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AzureSQLManagedUser{})
+func (r *AzureSQLManagedUserReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AzureSQLManagedUser{})
 }
 
 func (r *AzureSQLManagedUserReconciler) SetupWithManager(mgr ctrl.Manager) error {

diff --git a/controllers/azuresqlserver_controller.go b/controllers/azuresqlserver_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/Azure/azure-service-operator/api/v1beta1"
@@ -17,8 +19,8 @@ type AzureSqlServerReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=azuresqlservers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azuresqlservers/status,azuresqlservers/finalizers},verbs=get;update;patch
 
-func (r *AzureSqlServerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &v1beta1.AzureSqlServer{})
+func (r *AzureSqlServerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &v1beta1.AzureSqlServer{})
 }
 
 func (r *AzureSqlServerReconciler) SetupWithManager(mgr ctrl.Manager) error {

diff --git a/controllers/azuresqluser_controller.go b/controllers/azuresqluser_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
@@ -17,8 +19,8 @@ type AzureSQLUserReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=azuresqlusers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azuresqlusers/status,azuresqlusers/finalizers},verbs=get;update;patch
 
-func (r *AzureSQLUserReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AzureSQLUser{})
+func (r *AzureSQLUserReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AzureSQLUser{})
 }
 
 // SetupWithManager runs reconcile loop with manager

diff --git a/controllers/azuresqlvnetrule_controller.go b/controllers/azuresqlvnetrule_controller.go
@@ -4,6 +4,8 @@
 package controllers
 
 import (
+	"context"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
@@ -17,8 +19,8 @@ type AzureSQLVNetRuleReconciler struct {
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources=azuresqlvnetrules,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=azure.microsoft.com,resources={azuresqlvnetrules/status,azuresqlvnetrules/finalizers},verbs=get;update;patch
 
-func (r *AzureSQLVNetRuleReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	return r.Reconciler.Reconcile(req, &azurev1alpha1.AzureSQLVNetRule{})
+func (r *AzureSQLVNetRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	return r.Reconciler.Reconcile(ctx, req, &azurev1alpha1.AzureSQLVNetRule{})
 }
 
 func (r *AzureSQLVNetRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {