fix implementation and update status description

cofide · Nov 21, 2024 · e27f3f8 · e27f3f8
1 parent a3fa6cf
commit e27f3f8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 42 deletions.
diff --git a/cmd/cofidectl/cmd/workload/workload.go b/cmd/cofidectl/cmd/workload/workload.go
@@ -135,36 +135,6 @@ func (w *WorkloadCommand) GetStatusCommand() *cobra.Command {
 				return fmt.Errorf("failed to retrieve the kubeconfig file location")
 			}
 
-			ds, err := w.cmdCtx.PluginManager.GetDataSource()
-			if err != nil {
-				return err
-			}
-
-			var trustZones []*trust_zone_proto.TrustZone
-
-			if opts.trustZone != "" {
-				trustZone, err := ds.GetTrustZone(opts.trustZone)
-				if err != nil {
-					return err
-				}
-
-				trustZones = append(trustZones, trustZone)
-			} else {
-				trustZones, err = ds.ListTrustZones()
-				if err != nil {
-					return err
-				}
-			}
-
-			if len(trustZones) == 0 {
-				return fmt.Errorf("no trust zones have been configured")
-			}
-
-			err = renderRegisteredWorkloads(cmd.Context(), kubeConfig, trustZones)
-			if err != nil {
-				return err
-			}
-
 			opts.workloadName = args[0]
 			return w.status(cmd.Context(), kubeConfig, opts)
 		},

diff --git a/internal/pkg/provider/helm/values.go b/internal/pkg/provider/helm/values.go
@@ -57,7 +57,6 @@ func (g *HelmValuesGenerator) GenerateValues() (map[string]interface{}, error) {
 		fmt.Sprintf(`"spire-agent"."workloadAttestors"."%s"."enabled"`, agentConfig.WorkloadAttestor):                     agentConfig.WorkloadAttestorConfig["enabled"],
 		fmt.Sprintf(`"spire-agent"."workloadAttestors"."%s"."skipKubeletVerification"`, agentConfig.WorkloadAttestor):     agentConfig.WorkloadAttestorConfig["skipKubeletVerification"],
 		fmt.Sprintf(`"spire-agent"."workloadAttestors"."%s"."useNewContainerLocator"`, agentConfig.WorkloadAttestor):      agentConfig.WorkloadAttestorConfig["useNewContainerLocator"],
-		fmt.Sprintf(`"spire-agent"."workloadAttestors"."%s"."disableContainerSelectors"`, agentConfig.WorkloadAttestor):   agentConfig.WorkloadAttestorConfig["disableContainerSelectors"],
 		fmt.Sprintf(`"spire-agent"."workloadAttestors"."%s"."verboseContainerLocatorLogs"`, agentConfig.WorkloadAttestor): agentConfig.WorkloadAttestorConfig["verboseContainerLocatorLogs"],
 		`"spire-agent"."server"."address"`: "spire-server.spire",
 	}

diff --git a/internal/pkg/provider/helm/values_test.go b/internal/pkg/provider/helm/values_test.go
@@ -71,7 +71,7 @@ func TestHelmValuesGenerator_GenerateValues_success(t *testing.T) {
 					},
 					"workloadAttestors": Values{
 						"k8s": Values{
-							"disableContainerSelectors":   false,
+							"disableContainerSelectors":   true,
 							"enabled":                     true,
 							"skipKubeletVerification":     true,
 							"useNewContainerLocator":      false,
@@ -152,7 +152,7 @@ func TestHelmValuesGenerator_GenerateValues_success(t *testing.T) {
 					},
 					"workloadAttestors": Values{
 						"k8s": Values{
-							"disableContainerSelectors":   false,
+							"disableContainerSelectors":   true,
 							"enabled":                     true,
 							"skipKubeletVerification":     true,
 							"useNewContainerLocator":      false,

diff --git a/internal/pkg/workload/workload.go b/internal/pkg/workload/workload.go
@@ -143,14 +143,14 @@ func GetStatus(ctx context.Context, statusCh chan<- provider.ProviderStatus, dat
 	defer cancel()
 	statusCh <- provider.ProviderStatus{
 		Stage:   "Creating",
-		Message: fmt.Sprintf("Waiting for ephemeral container to be created in %s", podName),
+		Message: fmt.Sprintf("Waiting for ephemeral debug container to be created in %s", podName),
 	}
 
 	pod, err := client.Clientset.CoreV1().Pods(namespace).Get(ctx, podName, metav1.GetOptions{})
 	if err != nil {
 		statusCh <- provider.ProviderStatus{
 			Stage:   "Creating",
-			Message: fmt.Sprintf("Failed waiting for ephemeral container to be created in %s", podName),
+			Message: fmt.Sprintf("Failed waiting for ephemeral debug container to be created in %s", podName),
 			Done:    true,
 			Error:   err,
 		}
@@ -187,7 +187,7 @@ func GetStatus(ctx context.Context, statusCh chan<- provider.ProviderStatus, dat
 	if err != nil {
 		statusCh <- provider.ProviderStatus{
 			Stage:   "Creating",
-			Message: fmt.Sprintf("Failed waiting for ephemeral container to be created in %s", podName),
+			Message: fmt.Sprintf("Failed waiting for ephemeral debug container to be created in %s", podName),
 			Done:    true,
 			Error:   err,
 		}
@@ -196,15 +196,15 @@ func GetStatus(ctx context.Context, statusCh chan<- provider.ProviderStatus, dat
 
 	statusCh <- provider.ProviderStatus{
 		Stage:   "Waiting",
-		Message: "Waiting for ephemeral container to complete",
+		Message: "Waiting for ephemeral debug container to complete",
 	}
 
 	for {
 		pod, err := client.Clientset.CoreV1().Pods(namespace).Get(ctx, podName, metav1.GetOptions{})
 		if err != nil {
 			statusCh <- provider.ProviderStatus{
 				Stage:   "Waiting",
-				Message: "Error waiting for ephemeral container to complete",
+				Message: "Error waiting for ephemeral debug container to complete",
 			}
 			return
 		}
@@ -225,7 +225,7 @@ func GetStatus(ctx context.Context, statusCh chan<- provider.ProviderStatus, dat
 		case <-waitCtx.Done():
 			statusCh <- provider.ProviderStatus{
 				Stage:   "Waiting",
-				Message: "Error waiting for ephemeral container to complete",
+				Message: "Error waiting for ephemeral debug container to complete",
 			}
 			return
 		default:
@@ -240,7 +240,7 @@ func GetStatus(ctx context.Context, statusCh chan<- provider.ProviderStatus, dat
 	if err != nil {
 		statusCh <- provider.ProviderStatus{
 			Stage:   "Waiting",
-			Message: "Error waiting for ephemeral container logs",
+			Message: "Error waiting for ephemeral debug container logs",
 		}
 		return
 	}
@@ -252,15 +252,15 @@ func GetStatus(ctx context.Context, statusCh chan<- provider.ProviderStatus, dat
 	if err != nil {
 		statusCh <- provider.ProviderStatus{
 			Stage:   "Waiting",
-			Message: "Error waiting for ephemeral container logs",
+			Message: "Error waiting for ephemeral debug container logs",
 		}
 	}
 
 	dataCh <- buf.String()
 
 	statusCh <- provider.ProviderStatus{
 		Stage:   "Complete",
-		Message: fmt.Sprintf("Successfully executed emphemeral container in %s", podName),
+		Message: fmt.Sprintf("Successfully executed emphemeral debug container in %s", podName),
 		Done:    true,
 	}
 }