From da3a6ddf8a930a29c53fd6c2c029c4ce0d814ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volkan=20=C3=96z=C3=A7elik?= Date: Tue, 25 Jun 2024 16:12:36 -0700 Subject: [PATCH] Minor (#1012) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkan Özçelik --- app/safe/internal/server/route/base/extract/extract.go | 3 ++- hack/minikube-start.sh | 2 +- hack/print-spire-bundle.sh | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/safe/internal/server/route/base/extract/extract.go b/app/safe/internal/server/route/base/extract/extract.go index 6ad9b4be..e9b4c4e3 100644 --- a/app/safe/internal/server/route/base/extract/extract.go +++ b/app/safe/internal/server/route/base/extract/extract.go @@ -12,10 +12,11 @@ package extract import ( "encoding/json" + "regexp" + entity "github.com/vmware-tanzu/secrets-manager/core/entity/v1/data" "github.com/vmware-tanzu/secrets-manager/core/env" log "github.com/vmware-tanzu/secrets-manager/core/log/std" - "regexp" ) // WorkloadIDAndParts extracts the workload identifier and its constituent parts diff --git a/hack/minikube-start.sh b/hack/minikube-start.sh index c60ae1ab..3b7c3e19 100755 --- a/hack/minikube-start.sh +++ b/hack/minikube-start.sh @@ -16,7 +16,7 @@ minikube start \ --extra-config=apiserver.service-account-signing-key-file=/var/lib/minikube/certs/sa.key \ --extra-config=apiserver.service-account-key-file=/var/lib/minikube/certs/sa.pub \ --extra-config=apiserver.service-account-issuer=api \ - --extra-config=apiserver.api-audiences=api,spire-server-custom \ + --extra-config=apiserver.api-audiences=api,spire-server,spire-server-custom \ --extra-config=apiserver.authorization-mode=Node,RBAC \ --memory="$MEMORY" \ --cpus="$CPU" \ diff --git a/hack/print-spire-bundle.sh b/hack/print-spire-bundle.sh index 217b367f..c8813575 100755 --- a/hack/print-spire-bundle.sh +++ b/hack/print-spire-bundle.sh @@ -10,9 +10,11 @@ # >/' SPDX-License-Identifier: BSD-2-Clause # */ -SPIRE_SERVER=$(kubectl get po -n spire-server-custom \ - | grep "spire-server-custom-" | awk '{print $1}') +SPIRE_SERVER_NS="spire-server" + +SPIRE_SERVER=$(kubectl get po -n $SPIRE_SERVER_NS \ + | grep $SPIRE_SERVER_NS | awk '{print $1}') export SPIRE_SERVER=SPIRE_SERVER -kubectl exec -n spire-system-custom $SPIRE_SERVER -- \ +kubectl exec -n $SPIRE_SERVER_NS $SPIRE_SERVER -- \ /opt/spire/bin/spire-server bundle show