chore: please linters

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

Author: olivergondza

api/v1alpha1/zz_generated.deepcopy.go

@@ -255,7 +255,7 @@ func NewCR(name, ns string, client client.Client) (*argoapp.ArgoCD, error) {
 			ApplicationSet:     getArgoApplicationSetSpec(),
 			Controller:         getArgoControllerSpec(),
 			SSO:                getArgoSSOSpec(client),
-			Grafana:            getArgoGrafanaSpec(),
+			Grafana:            getArgoGrafanaSpec(), //nolint:staticcheck // Deprecated field
 			HA:                 getArgoHASpec(),
 			Redis:              getArgoRedisSpec(),
 			Repo:               getArgoRepoServerSpec(),

controllers/argocd/argocd.go

@@ -386,10 +386,10 @@ func (r *ReconcileGitopsService) reconcileDeployment(cr *pipelinesv1alpha1.Gitop
 
 	// ADD THIS: Get ConfigMap and add hash to pod template annotations
 	configMapHash := getConfigMapHash(newPluginConfigMap)
-	if newPluginDeployment.Spec.Template.ObjectMeta.Annotations == nil {
-		newPluginDeployment.Spec.Template.ObjectMeta.Annotations = make(map[string]string)
+	if newPluginDeployment.Spec.Template.Annotations == nil {
+		newPluginDeployment.Spec.Template.Annotations = make(map[string]string)
 	}
-	newPluginDeployment.Spec.Template.ObjectMeta.Annotations["httpd-cfg-hash"] = configMapHash
+	newPluginDeployment.Spec.Template.Annotations["httpd-cfg-hash"] = configMapHash
 
 	// Check if this Deployment already exists
 	existingPluginDeployment := &appsv1.Deployment{}
@@ -413,7 +413,7 @@ func (r *ReconcileGitopsService) reconcileDeployment(cr *pipelinesv1alpha1.Gitop
 			!equality.Semantic.DeepEqual(existingPluginDeployment.Spec.Replicas, newPluginDeployment.Spec.Replicas) ||
 			!equality.Semantic.DeepEqual(existingPluginDeployment.Spec.Selector, newPluginDeployment.Spec.Selector) ||
 			!equality.Semantic.DeepEqual(existingSpecTemplate.Labels, newSpecTemplate.Labels) ||
-			!equality.Semantic.DeepEqual(existingSpecTemplate.ObjectMeta.Annotations["httpd-cfg-hash"], newSpecTemplate.ObjectMeta.Annotations["httpd-cfg-hash"]) ||
+			!equality.Semantic.DeepEqual(existingSpecTemplate.Annotations["httpd-cfg-hash"], newSpecTemplate.Annotations["httpd-cfg-hash"]) ||
 			!equality.Semantic.DeepEqual(sortContainers(existingSpecTemplate.Spec.Containers), sortContainers(newSpecTemplate.Spec.Containers)) ||
 			!equality.Semantic.DeepEqual(sortVolumes(existingSpecTemplate.Spec.Volumes), sortVolumes(newSpecTemplate.Spec.Volumes)) ||
 			!equality.Semantic.DeepEqual(existingSpecTemplate.Spec.RestartPolicy, newSpecTemplate.Spec.RestartPolicy) ||
@@ -424,15 +424,15 @@ func (r *ReconcileGitopsService) reconcileDeployment(cr *pipelinesv1alpha1.Gitop
 			!equality.Semantic.DeepEqual(existingSpecTemplate.Spec.Containers[0].Resources, newSpecTemplate.Spec.Containers[0].Resources)
 
 		if changed {
-			if existingSpecTemplate.ObjectMeta.Annotations == nil {
-				existingSpecTemplate.ObjectMeta.Annotations = make(map[string]string)
+			if existingSpecTemplate.Annotations == nil {
+				existingSpecTemplate.Annotations = make(map[string]string)
 			}
 			reqLogger.Info("Reconciling plugin deployment", "Namespace", existingPluginDeployment.Namespace, "Name", existingPluginDeployment.Name)
 			existingPluginDeployment.Labels = newPluginDeployment.Labels
 			existingPluginDeployment.Spec.Replicas = newPluginDeployment.Spec.Replicas
 			existingPluginDeployment.Spec.Selector = newPluginDeployment.Spec.Selector
 			existingSpecTemplate.Labels = newSpecTemplate.Labels
-			existingSpecTemplate.ObjectMeta.Annotations["httpd-cfg-hash"] = newSpecTemplate.ObjectMeta.Annotations["httpd-cfg-hash"]
+			existingSpecTemplate.Annotations["httpd-cfg-hash"] = newSpecTemplate.Annotations["httpd-cfg-hash"]
 			existingSpecTemplate.Spec.SecurityContext = newSpecTemplate.Spec.SecurityContext
 			existingSpecTemplate.Spec.Containers = newSpecTemplate.Spec.Containers
 			existingSpecTemplate.Spec.Volumes = newSpecTemplate.Spec.Volumes

controllers/consoleplugin.go

@@ -70,7 +70,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				Spec: argov1beta1api.ArgoCDSpec{
 					Controller: argov1beta1api.ArgoCDApplicationControllerSpec{
 						Sharding: argov1beta1api.ArgoCDApplicationControllerShardSpec{
-							DynamicScalingEnabled: new(true),
+							DynamicScalingEnabled: new(true), //nolint:staticcheck // Test for a deprecated field
 							MinShards:             1,
 							MaxShards:             4,
 							ClustersPerShard:      1,