chore: resolve review comments

Author: himsngh

pkg/apiserver/apiserver.go

@@ -36,6 +36,7 @@ import (
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+	"k8s.io/client-go/util/retry"
 	apiregv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 	aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
 )
@@ -279,19 +280,22 @@ func getServerVersion(discoveryClient discovery.DiscoveryInterface) (semver.Vers
 }
 
 func updateAPIService(ctx context.Context, logger logr.Logger, client aggregatorclient.Interface, caProvider dynamiccertificates.CAContentProvider) error {
-	apiService, err := client.ApiregistrationV1().APIServices().Get(ctx, apiServiceName, metav1.GetOptions{})
-	if err != nil {
-		return fmt.Errorf("error getting APIService %s: %v", apiServiceName, err)
-	}
+	if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		apiService, err := client.ApiregistrationV1().APIServices().Get(ctx, apiServiceName, metav1.GetOptions{})
+		if err != nil {
+			return fmt.Errorf("error getting APIService %s: %v", apiServiceName, err)
+		}
 
-	caBundle := caProvider.CurrentCABundleContent()
-	if bytes.Equal(apiService.Spec.CABundle, caBundle) {
-		return nil
-	}
+		caBundle := caProvider.CurrentCABundleContent()
+		if bytes.Equal(apiService.Spec.CABundle, caBundle) {
+			return nil
+		}
 
-	logger.Info("Syncing CA certificate with APIServices")
-	apiService.Spec.CABundle = caBundle
-	if _, err := client.ApiregistrationV1().APIServices().Update(ctx, apiService, metav1.UpdateOptions{}); err != nil {
+		logger.Info("Syncing CA certificate with APIServices")
+		apiService.Spec.CABundle = caBundle
+		_, err = client.ApiregistrationV1().APIServices().Update(ctx, apiService, metav1.UpdateOptions{})
+		return err
+	}); err != nil {
 		return fmt.Errorf("error updating kapp-controller CA cert of APIService %s: %v", apiServiceName, err)
 	}
 	return nil

pkg/apiserver/apiserver_test.go

@@ -22,16 +22,15 @@ type fakeCAProvider struct {
 	bundle []byte
 }
 
-func (f *fakeCAProvider) Name() string                                      { return "fake-ca-provider" }
-func (f *fakeCAProvider) CurrentCABundleContent() []byte                    { return f.bundle }
-func (f *fakeCAProvider) AddListener(listener dynamiccertificates.Listener) {}
+func (f *fakeCAProvider) Name() string                               { return "fake-ca-provider" }
+func (f *fakeCAProvider) CurrentCABundleContent() []byte             { return f.bundle }
+func (f *fakeCAProvider) AddListener(_ dynamiccertificates.Listener) {}
 func (f *fakeCAProvider) VerifyOptions() (x509.VerifyOptions, bool) {
 	return x509.VerifyOptions{}, false
 }
 
 func Test_updateAPIService(t *testing.T) {
-	apiServiceName := "v1alpha1.data.packaging.carvel.dev"
-	dummyLogger := logr.Discard()
+	logger := logr.Discard()
 
 	tests := []struct {
 		name           string
@@ -65,7 +64,7 @@ func Test_updateAPIService(t *testing.T) {
 
 			fakeProvider := &fakeCAProvider{bundle: tc.newBundle}
 
-			err := updateAPIService(context.TODO(), dummyLogger, fakeClient, fakeProvider)
+			err := updateAPIService(context.TODO(), logger, fakeClient, fakeProvider)
 			require.NoError(t, err)
 
 			actions := fakeClient.Actions()
@@ -76,7 +75,10 @@ func Test_updateAPIService(t *testing.T) {
 			for _, action := range actions {
 				if action.GetVerb() == "update" {
 					updateActionFound = true
-					updateAction := action.(clienttesting.UpdateAction)
+					updateAction, ok := action.(clienttesting.UpdateAction)
+					if !ok {
+						t.Fatalf("Expected UpdateAction, got %T", action)
+					}
 					updatedSvc := updateAction.GetObject().(*apiregv1.APIService)
 					require.Equal(t, tc.newBundle, updatedSvc.Spec.CABundle)
 				}