Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor #1012

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Minor #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/safe/internal/server/route/base/extract/extract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/minikube-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
8 changes: 5 additions & 3 deletions hack/print-spire-bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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