Skip to content

Commit 313b30f

Browse files
Rizwana777Rizwana777
committed
adress review comments to return err and add new e2e test
Signed-off-by: Rizwana777 <rizwananaaz177@gmail.com>
1 parent 9099a47 commit 313b30f

8 files changed

Lines changed: 153 additions & 68 deletions

File tree

‎cmd/main.go‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -307,17 +307,10 @@ func main() {
307307
}
308308
}
309309

310-
pluginNamespace := "openshift-gitops-operator"
311-
data, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
310+
pluginNamespace, err := util.GetOperatorNamespace()
312311
if err != nil {
313-
if os.IsNotExist(err) {
314-
setupLog.Info(fmt.Sprintf("Unable to retrieve the operator's running namespace via serviceaccount: %v. Using default namespace '%s'. This is expected when running locally.", err, pluginNamespace))
315-
} else {
316-
setupLog.Error(err, "Error retrieving operator's running namespace")
317-
os.Exit(1)
318-
}
319-
} else {
320-
pluginNamespace = strings.TrimSpace(string(data))
312+
setupLog.Error(err, "Error retrieving operator's running namespace")
313+
os.Exit(1)
321314
}
322315

323316
if util.IsOpenShiftCluster() {

‎controllers/consoleplugin.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,9 @@ ServerRoot "/etc/httpd"
274274
}
275275

276276
// pluginConfigMap creates the ConfigMap with dynamic httpd.conf
277-
func (r *ReconcileGitopsService) pluginConfigMap() *corev1.ConfigMap {
277+
func (r *ReconcileGitopsService) pluginConfigMap(namespace string) *corev1.ConfigMap {
278278
httpdConfig := r.buildHttpdConfig()
279279

280-
func pluginConfigMap(namespace string) *corev1.ConfigMap {
281280
cm := &corev1.ConfigMap{
282281
ObjectMeta: metav1.ObjectMeta{
283282
Name: httpdConfigMapName,
@@ -482,7 +481,7 @@ func (r *ReconcileGitopsService) reconcileService(instance *pipelinesv1alpha1.Gi
482481
existingServiceRef.Labels = pluginServiceRef.Labels
483482
existingServiceRef.Spec.Selector = pluginServiceRef.Spec.Selector
484483
existingServiceRef.Spec.Ports = pluginServiceRef.Spec.Ports
485-
return reconcile.Result{}, r.Client.Update(context.TODO(), pluginServiceRef)
484+
return reconcile.Result{}, r.Client.Update(context.TODO(), existingServiceRef)
486485
}
487486
}
488487
return reconcile.Result{}, nil
@@ -546,7 +545,6 @@ func getConfigMapHash(cm *corev1.ConfigMap) string {
546545

547546
func (r *ReconcileGitopsService) reconcileConfigMap(instance *pipelinesv1alpha1.GitopsService, request reconcile.Request, newPluginConfigMap *corev1.ConfigMap) (reconcile.Result, error) {
548547
reqLogger := logs.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
549-
newPluginConfigMap := pluginConfigMap(r.PluginNamespace)
550548

551549
if err := controllerutil.SetControllerReference(instance, newPluginConfigMap, r.Scheme); err != nil {
552550
return reconcile.Result{}, err
@@ -579,9 +577,9 @@ func (r *ReconcileGitopsService) reconcileConfigMap(instance *pipelinesv1alpha1.
579577
}
580578

581579
// cleanupOldPluginResources removes plugin resources from the old namespace (openshift-gitops) after they have been moved to the operator namespace, since owner references on the cluster-scoped GitopsService CR won't trigger garbage collection.
582-
func (r *ReconcileGitopsService) cleanupOldPluginResources(ctx context.Context) {
580+
func (r *ReconcileGitopsService) cleanupOldPluginResources(ctx context.Context) error {
583581
if r.PluginNamespace == serviceNamespace {
584-
return
582+
return nil
585583
}
586584

587585
reqLogger := logs.WithValues()
@@ -590,25 +588,27 @@ func (r *ReconcileGitopsService) cleanupOldPluginResources(ctx context.Context)
590588
if err := r.Client.Get(ctx, types.NamespacedName{Name: gitopsPluginName, Namespace: serviceNamespace}, oldDeploy); err == nil {
591589
reqLogger.Info("Cleaning up old plugin Deployment from previous namespace", "Namespace", serviceNamespace)
592590
if err := r.Client.Delete(ctx, oldDeploy); err != nil && !errors.IsNotFound(err) {
593-
reqLogger.Error(err, "Failed to delete old plugin Deployment", "Namespace", serviceNamespace)
591+
return fmt.Errorf("failed to delete old plugin Deployment from namespace %s: %w", serviceNamespace, err)
594592
}
595593
}
596594

597595
oldSvc := &corev1.Service{}
598596
if err := r.Client.Get(ctx, types.NamespacedName{Name: gitopsPluginName, Namespace: serviceNamespace}, oldSvc); err == nil {
599597
reqLogger.Info("Cleaning up old plugin Service from previous namespace", "Namespace", serviceNamespace)
600598
if err := r.Client.Delete(ctx, oldSvc); err != nil && !errors.IsNotFound(err) {
601-
reqLogger.Error(err, "Failed to delete old plugin Service", "Namespace", serviceNamespace)
599+
return fmt.Errorf("failed to delete old plugin Service from namespace %s: %w", serviceNamespace, err)
602600
}
603601
}
604602

605603
oldCM := &corev1.ConfigMap{}
606604
if err := r.Client.Get(ctx, types.NamespacedName{Name: httpdConfigMapName, Namespace: serviceNamespace}, oldCM); err == nil {
607605
reqLogger.Info("Cleaning up old plugin ConfigMap from previous namespace", "Namespace", serviceNamespace)
608606
if err := r.Client.Delete(ctx, oldCM); err != nil && !errors.IsNotFound(err) {
609-
reqLogger.Error(err, "Failed to delete old plugin ConfigMap", "Namespace", serviceNamespace)
607+
return fmt.Errorf("failed to delete old plugin ConfigMap from namespace %s: %w", serviceNamespace, err)
610608
}
611609
}
610+
611+
return nil
612612
}
613613

614614
// is this func the reconciler enty point to reconcile the current plugin state?
@@ -620,7 +620,7 @@ func (r *ReconcileGitopsService) reconcilePlugin(instance *pipelinesv1alpha1.Git
620620
}
621621

622622
// Generate ConfigMap once
623-
newPluginConfigMap := r.pluginConfigMap()
623+
newPluginConfigMap := r.pluginConfigMap(r.PluginNamespace)
624624

625625
if result, err := r.reconcileService(instance, request); err != nil {
626626
return result, err

‎controllers/consoleplugin_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ func TestPlugin_reconcileDeployment_changedTemplateLabels(t *testing.T) {
602602
fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(newGitopsService(), d).Build()
603603
reconciler := newReconcileGitOpsService(fakeClient, s)
604604

605-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
605+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
606606
assertNoError(t, err)
607607

608608
deployment := &appsv1.Deployment{}
@@ -647,7 +647,7 @@ func TestPlugin_reconcileDeployment_changedContainers(t *testing.T) {
647647
assert.DeepEqual(t, deployment.Spec.Template.Spec.Containers[0].SecurityContext, securityContextForPlugin())
648648
}
649649

650-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
650+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
651651
assertNoError(t, err)
652652

653653
// There should be a new console plugin deployment created
@@ -672,7 +672,7 @@ func TestPlugin_reconcileDeployment_changedContainers(t *testing.T) {
672672
assertNoError(t, err)
673673

674674
// Verify if the containers are reconciled back to the default values
675-
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
675+
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
676676
assertNoError(t, err)
677677

678678
deployment = &appsv1.Deployment{}
@@ -979,7 +979,7 @@ func TestPlugin_reconcileDeployment_infraNodeSelectorNotInPodSpec(t *testing.T)
979979
fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(gitopsService).Build()
980980
reconciler := newReconcileGitOpsService(fakeClient, s)
981981

982-
_, err := reconciler.reconcileDeployment(gitopsService, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
982+
_, err := reconciler.reconcileDeployment(gitopsService, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
983983
assertNoError(t, err)
984984

985985
deployment := &appsv1.Deployment{}
@@ -999,7 +999,7 @@ func TestPlugin_reconcileDeployment(t *testing.T) {
999999
reconciler := newReconcileGitOpsService(fakeClient, s)
10001000
instance := &pipelinesv1alpha1.GitopsService{}
10011001

1002-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1002+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
10031003
assertNoError(t, err)
10041004

10051005
deployment := &appsv1.Deployment{}
@@ -1036,7 +1036,7 @@ func TestPlugin_reconcileDeployment_ChangedResources(t *testing.T) {
10361036
},
10371037
}
10381038

1039-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1039+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
10401040
assertNoError(t, err)
10411041

10421042
deployment := &appsv1.Deployment{}
@@ -1056,7 +1056,7 @@ func TestPlugin_ReconcileDeployment_DefaultResourceValues(t *testing.T) {
10561056
fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(newGitopsService()).Build()
10571057
reconciler := newReconcileGitOpsService(fakeClient, s)
10581058
instance := &pipelinesv1alpha1.GitopsService{}
1059-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1059+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
10601060
assertNoError(t, err)
10611061

10621062
deployment := &appsv1.Deployment{}
@@ -1096,7 +1096,7 @@ func TestPlugin_ReconcileDeployment_ChangeExistingResourceValues(t *testing.T) {
10961096
Resources: Resources,
10971097
},
10981098
}
1099-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1099+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
11001100
assertNoError(t, err)
11011101

11021102
deployment := &appsv1.Deployment{}
@@ -1120,7 +1120,7 @@ func TestPlugin_ReconcileDeployment_ChangeExistingResourceValues(t *testing.T) {
11201120
}
11211121
instance.Spec.ConsolePlugin.Backend.Resources, instance.Spec.ConsolePlugin.GitopsPlugin.Resources = updatedResources, updatedResources
11221122

1123-
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1123+
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
11241124
assertNoError(t, err)
11251125

11261126
deployment = &appsv1.Deployment{}
@@ -1593,7 +1593,7 @@ func TestPlug_reconcileConfigMap(t *testing.T) {
15931593
reconciler := newReconcileGitOpsService(fakeClient, s)
15941594

15951595
instance := &pipelinesv1alpha1.GitopsService{}
1596-
_, err := reconciler.reconcileConfigMap(instance, newRequest(serviceNamespace, httpdConfigMapName), reconciler.pluginConfigMap())
1596+
_, err := reconciler.reconcileConfigMap(instance, newRequest(serviceNamespace, httpdConfigMapName), reconciler.pluginConfigMap(serviceNamespace))
15971597
assertNoError(t, err)
15981598

15991599
configMap := &corev1.ConfigMap{}
@@ -1669,7 +1669,7 @@ func TestReconcileDeployment_NoUpdateWhenContainersOrderDiffers(t *testing.T) {
16691669
instance := &pipelinesv1alpha1.GitopsService{}
16701670

16711671
// Create deployment
1672-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1672+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
16731673
assertNoError(t, err)
16741674

16751675
// Get the deployment and capture initial ResourceVersion and Generation
@@ -1692,7 +1692,7 @@ func TestReconcileDeployment_NoUpdateWhenContainersOrderDiffers(t *testing.T) {
16921692
}
16931693

16941694
// Reconcile again - should NOT trigger an update
1695-
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1695+
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
16961696
assertNoError(t, err)
16971697

16981698
// Verify no update was triggered
@@ -1715,7 +1715,7 @@ func TestReconcileDeployment_NoUpdateWhenVolumesOrderDiffers(t *testing.T) {
17151715
instance := &pipelinesv1alpha1.GitopsService{}
17161716

17171717
// Create deployment
1718-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1718+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
17191719
assertNoError(t, err)
17201720

17211721
// Get the deployment
@@ -1740,7 +1740,7 @@ func TestReconcileDeployment_NoUpdateWhenVolumesOrderDiffers(t *testing.T) {
17401740
genAfterManualUpdate := deployment.Generation
17411741

17421742
// Reconcile again - should NOT trigger an update
1743-
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1743+
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
17441744
assertNoError(t, err)
17451745

17461746
// Verify no update was triggered
@@ -1786,7 +1786,7 @@ func TestReconcileDeployment_NoUpdateWhenTolerationsOrderDiffers(t *testing.T) {
17861786
reconciler := newReconcileGitOpsService(fakeClient, s)
17871787

17881788
// Create deployment
1789-
_, err := reconciler.reconcileDeployment(gitopsService, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1789+
_, err := reconciler.reconcileDeployment(gitopsService, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
17901790
assertNoError(t, err)
17911791

17921792
// Get the deployment
@@ -1811,7 +1811,7 @@ func TestReconcileDeployment_NoUpdateWhenTolerationsOrderDiffers(t *testing.T) {
18111811
genAfterManualUpdate := deployment.Generation
18121812

18131813
// Reconcile again - should NOT trigger an update
1814-
_, err = reconciler.reconcileDeployment(gitopsService, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1814+
_, err = reconciler.reconcileDeployment(gitopsService, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
18151815
assertNoError(t, err)
18161816

18171817
// Verify no update was triggered
@@ -1837,7 +1837,7 @@ func TestReconcileDeployment_UpdateWhenActualChange(t *testing.T) {
18371837
instance := &pipelinesv1alpha1.GitopsService{}
18381838

18391839
// Create deployment
1840-
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1840+
_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
18411841
assertNoError(t, err)
18421842

18431843
// Get the deployment and capture initial ResourceVersion and Generation
@@ -1852,7 +1852,7 @@ func TestReconcileDeployment_UpdateWhenActualChange(t *testing.T) {
18521852
assertNoError(t, err)
18531853

18541854
// Reconcile again - should trigger an update
1855-
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap())
1855+
_, err = reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName), reconciler.pluginConfigMap(serviceNamespace))
18561856
assertNoError(t, err)
18571857

18581858
// Verify update was triggered
@@ -2022,7 +2022,7 @@ func TestReconcileDeployment_AddsHashAnnotation(t *testing.T) {
20222022
"httpd.conf": "config-v1",
20232023
},
20242024
}
2025-
r := &ReconcileGitopsService{Client: fake.NewClientBuilder().WithScheme(scheme).WithObjects(instance).Build(), Scheme: scheme}
2025+
r := &ReconcileGitopsService{Client: fake.NewClientBuilder().WithScheme(scheme).WithObjects(instance).Build(), Scheme: scheme, PluginNamespace: serviceNamespace}
20262026
_, err := r.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsService), cm)
20272027
assert.NilError(t, err)
20282028
deployment := &appsv1.Deployment{}
@@ -2055,7 +2055,7 @@ func TestReconcileDeployment_UpdatesHashAnnotationWhenConfigChanges(t *testing.T
20552055
"httpd.conf": "config-v2",
20562056
},
20572057
}
2058-
r := &ReconcileGitopsService{Client: fake.NewClientBuilder().WithScheme(scheme).WithObjects(instance).Build(), Scheme: scheme}
2058+
r := &ReconcileGitopsService{Client: fake.NewClientBuilder().WithScheme(scheme).WithObjects(instance).Build(), Scheme: scheme, PluginNamespace: serviceNamespace}
20592059
_, err := r.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsService), cm1)
20602060
assert.NilError(t, err)
20612061
_, err = r.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsService), cm2)

‎controllers/gitopsservice_controller.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@ func (r *ReconcileGitopsService) Reconcile(ctx context.Context, request reconcil
286286

287287
r.cleanKAMResources(ctx, reqLogger)
288288

289+
if err := r.cleanupOldPluginResources(ctx); err != nil {
290+
reqLogger.Error(err, "Failed to cleanup old plugin resources")
291+
}
292+
289293
if !r.DisableDefaultInstall {
290294
// Create/reconcile the default Argo CD instance, unless default install is disabled
291295
if result, err := r.reconcileDefaultArgoCDInstance(instance, reqLogger); err != nil {
@@ -355,14 +359,7 @@ func (r *ReconcileGitopsService) Reconcile(ctx context.Context, request reconcil
355359
return reconcile.Result{}, nil
356360
}
357361

358-
result, err := r.reconcilePlugin(instance, request)
359-
if err != nil {
360-
return result, err
361-
}
362-
363-
r.cleanupOldPluginResources(ctx)
364-
365-
return result, nil
362+
return r.reconcilePlugin(instance, request)
366363
}
367364

368365
// Detect the unsupported KAM components across Deployments , Routes , Services and deletes them to perform cleanup as KAM is no longer supported since 1.15

‎controllers/util/util.go‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ import (
4141
)
4242

4343
const (
44-
clusterVersionName = "version"
44+
clusterVersionName = "version"
45+
operatorPodNamespacePath = "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
46+
DefaultOperatorNamespace = "openshift-gitops-operator"
4547
)
4648

4749
var (
@@ -289,3 +291,17 @@ func AddSeccompProfileForOpenShift(client client.Client, podspec *corev1.PodSpec
289291
}
290292
}
291293
}
294+
295+
// GetOperatorNamespace returns the namespace the operator is running in by reading
296+
// the serviceaccount namespace file. If the file is not found (e.g. running locally),
297+
// it returns the default operator namespace and a nil error.
298+
func GetOperatorNamespace() (string, error) {
299+
data, err := os.ReadFile(operatorPodNamespacePath)
300+
if err != nil {
301+
if os.IsNotExist(err) {
302+
return DefaultOperatorNamespace, nil
303+
}
304+
return "", fmt.Errorf("error retrieving operator namespace: %w", err)
305+
}
306+
return strings.TrimSpace(string(data)), nil
307+
}

‎test/e2e/suite_test.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121
"os"
2222
"path/filepath"
23-
"strings"
2423
"testing"
2524
"time"
2625

@@ -147,15 +146,8 @@ var _ = BeforeSuite(func() {
147146
})
148147
Expect(err).NotTo(HaveOccurred())
149148

150-
pluginNamespace := "openshift-gitops-operator"
151-
data, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
152-
if err != nil {
153-
if !os.IsNotExist(err) {
154-
Expect(err).NotTo(HaveOccurred(), "Error retrieving operator's running namespace")
155-
}
156-
} else {
157-
pluginNamespace = strings.TrimSpace(string(data))
158-
}
149+
pluginNamespace, err := util.GetOperatorNamespace()
150+
Expect(err).NotTo(HaveOccurred(), "Error retrieving operator's running namespace")
159151

160152
err = (&controllers.ReconcileGitopsService{
161153
Client: mgr.GetClient(),

‎test/nondefaulte2e/suite_test.go‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,8 @@ var _ = BeforeSuite(func() {
132132
})
133133
Expect(err).NotTo(HaveOccurred())
134134

135-
pluginNamespace := "openshift-gitops-operator"
136-
data, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
137-
if err != nil {
138-
if !os.IsNotExist(err) {
139-
Expect(err).NotTo(HaveOccurred(), "Error retrieving operator's running namespace")
140-
}
141-
} else {
142-
pluginNamespace = strings.TrimSpace(string(data))
143-
}
135+
pluginNamespace, err := util.GetOperatorNamespace()
136+
Expect(err).NotTo(HaveOccurred(), "Error retrieving operator's running namespace")
144137

145138
err = (&controllers.ReconcileGitopsService{
146139
Client: mgr.GetClient(),

0 commit comments

Comments
 (0)