diff --git a/.gitignore b/.gitignore index f17fea8d8..61c6ced0c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ prober /createctconfig /createdb /createsecret +/rekor-createsecret /createtree /getoidctoken /managectroots diff --git a/.ko.yaml b/.ko.yaml index 32a662f45..99224a590 100644 --- a/.ko.yaml +++ b/.ko.yaml @@ -186,7 +186,7 @@ builds: - id: rekor-createsecret dir: . - main: ./cmd/rekor/createsecret + main: ./cmd/rekor/rekor-createsecret env: - CGO_ENABLED=0 flags: diff --git a/Makefile b/Makefile index c043b454a..5a7d0d9e0 100644 --- a/Makefile +++ b/Makefile @@ -138,7 +138,7 @@ build-getoidctoken: .PHONY: build-rekor-createsecret build-rekor-createsecret: - go build -trimpath ./cmd/rekor/createsecret + go build -trimpath ./cmd/rekor/rekor-createsecret .PHONY: build-trillian-createdb build-trillian-createdb: diff --git a/README.md b/README.md index 4741f5826..171794d82 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ have the following (some stuff omitted for readability) in our Rekor Deployment to ensure that Rekor will not start prior to TreeID having been properly provisioned. Rekor also needs a Signing Key that it will use, and we create one with -[CreateSecret](./cmd/rekor/createsecret/main.go). It will create two secrets, +[CreateSecret](./cmd/rekor/rekor-createsecret/main.go). It will create two secrets, one holding the Private Signing key as well as the password used to encrypt it with. By default the secret is named `rekor-signing-secret` and contains two keys: diff --git a/cmd/rekor/createsecret/main.go b/cmd/rekor/rekor-createsecret/main.go similarity index 95% rename from cmd/rekor/createsecret/main.go rename to cmd/rekor/rekor-createsecret/main.go index 63aa372ca..daab34a77 100644 --- a/cmd/rekor/createsecret/main.go +++ b/cmd/rekor/rekor-createsecret/main.go @@ -54,7 +54,7 @@ func main() { ctx := signals.NewContext() versionInfo := version.GetVersionInfo() - logging.FromContext(ctx).Infof("running createsecret Version: %s GitCommit: %s BuildDate: %s", versionInfo.GitVersion, versionInfo.GitCommit, versionInfo.BuildDate) + logging.FromContext(ctx).Infof("running rekor-createsecret Version: %s GitCommit: %s BuildDate: %s", versionInfo.GitVersion, versionInfo.GitCommit, versionInfo.BuildDate) config, err := rest.InClusterConfig() if err != nil { diff --git a/config/rekor/createsecret/300-createsecret.yaml b/config/rekor/createsecret/300-createsecret.yaml index db09b8028..b85b3669c 100644 --- a/config/rekor/createsecret/300-createsecret.yaml +++ b/config/rekor/createsecret/300-createsecret.yaml @@ -18,7 +18,7 @@ spec: automountServiceAccountToken: true containers: - name: createsecret - image: ko://github.com/sigstore/scaffolding/cmd/rekor/createsecret + image: ko://github.com/sigstore/scaffolding/cmd/rekor/rekor-createsecret env: - name: NAMESPACE valueFrom: