Skip to content
This repository has been archived by the owner on Sep 21, 2023. It is now read-only.

made vault-operator track vault upstream image, upgrade and enable ui #328

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion example/example_vault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: "example"
spec:
nodes: 2
version: "0.9.1-0"
version: "0.10.2"
4 changes: 2 additions & 2 deletions pkg/apis/vault/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
)

const (
defaultBaseImage = "quay.io/coreos/vault"
defaultBaseImage = "vault"
// version format is "<upstream-version>-<our-version>"
defaultVersion = "0.9.1-0"
defaultVersion = "0.10.2"
)

type ClusterPhase string
Expand Down
6 changes: 3 additions & 3 deletions pkg/util/k8sutil/vault.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ func vaultContainer(v *api.VaultService) v1.Container {
Name: "vault",
Image: fmt.Sprintf("%s:%s", v.Spec.BaseImage, v.Spec.Version),
Command: []string{
"/bin/vault",
"server",
"-config=" + VaultConfigPath,
"sh",
"-c",
"setcap cap_ipc_lock=+ep /bin/vault && apk --no-cache add curl && exec /bin/vault server -config=" + VaultConfigPath,
},
Env: []v1.EnvVar{
{
Expand Down
2 changes: 2 additions & 0 deletions pkg/util/vaultutil/vault_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ storage "etcd" {
func NewConfigWithDefaultParams(data string) string {
buf := bytes.NewBufferString(data)
buf.WriteString(`
ui = true

telemetry {
statsd_address = "localhost:9125"
}
Expand Down