@@ -105,11 +105,11 @@ func TestMain(m *testing.M) {
105105 if ! keepKustomizeDeploys {
106106 addCleanup (func (context.Context ) error {
107107 cleanupLog ("delete bpfman configmap to cleanup bpfman daemon" )
108- env .Cluster ().Client ().CoreV1 ().ConfigMaps (internal .BpfmanNs ).Delete (ctx , internal .BpfmanConfigName , metav1.DeleteOptions {})
108+ env .Cluster ().Client ().CoreV1 ().ConfigMaps (internal .BpfmanNamespace ).Delete (ctx , internal .BpfmanConfigName , metav1.DeleteOptions {})
109109 clusters .DeleteManifestByYAML (ctx , env .Cluster (), bpfmanConfigMap )
110110 waitForBpfmanConfigDelete (ctx , env )
111111 cleanupLog ("deleting bpfman namespace" )
112- return env .Cluster ().Client ().CoreV1 ().Namespaces ().Delete (ctx , internal .BpfmanNs , metav1.DeleteOptions {})
112+ return env .Cluster ().Client ().CoreV1 ().Namespaces ().Delete (ctx , internal .BpfmanNamespace , metav1.DeleteOptions {})
113113 })
114114 }
115115
@@ -180,7 +180,7 @@ func waitForBpfmanReadiness(ctx context.Context, env environments.Environment) e
180180 fmt .Println ("INFO: waiting for bpfman" )
181181 var controlplaneReady , dataplaneReady bool
182182
183- controlplane , err := env .Cluster ().Client ().AppsV1 ().Deployments (internal .BpfmanNs ).Get (ctx , internal .BpfmanOperatorName , metav1.GetOptions {})
183+ controlplane , err := env .Cluster ().Client ().AppsV1 ().Deployments (internal .BpfmanNamespace ).Get (ctx , internal .BpfmanOperatorName , metav1.GetOptions {})
184184 if err != nil {
185185 if errors .IsNotFound (err ) {
186186 fmt .Println ("INFO: bpfman-operator dep not found yet" )
@@ -192,7 +192,7 @@ func waitForBpfmanReadiness(ctx context.Context, env environments.Environment) e
192192 controlplaneReady = true
193193 }
194194
195- dataplane , err := env .Cluster ().Client ().AppsV1 ().DaemonSets (internal .BpfmanNs ).Get (ctx , internal .BpfmanDsName , metav1.GetOptions {})
195+ dataplane , err := env .Cluster ().Client ().AppsV1 ().DaemonSets (internal .BpfmanNamespace ).Get (ctx , internal .BpfmanDsName , metav1.GetOptions {})
196196 if err != nil {
197197 if errors .IsNotFound (err ) {
198198 fmt .Println ("INFO: bpfman daemon not found yet" )
@@ -224,7 +224,7 @@ func waitForBpfmanConfigDelete(ctx context.Context, env environments.Environment
224224 default :
225225 fmt .Println ("INFO: waiting for bpfman config deletion" )
226226
227- _ , err := env .Cluster ().Client ().CoreV1 ().ConfigMaps (internal .BpfmanNs ).Get (ctx , internal .BpfmanConfigName , metav1.GetOptions {})
227+ _ , err := env .Cluster ().Client ().CoreV1 ().ConfigMaps (internal .BpfmanNamespace ).Get (ctx , internal .BpfmanConfigName , metav1.GetOptions {})
228228 if err != nil {
229229 if errors .IsNotFound (err ) {
230230 fmt .Println ("INFO: bpfman configmap deleted successfully" )
0 commit comments