Merge branch 'master' into user-group-runas-annotations

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Unreleased
 
+## 0.3.0 (March 5th, 2020)
+
 Features:
 
 * Added flag/env to change log-format for the injector: [GH-50](https://github.com/hashicorp/vault-k8s/pull/50)

Makefile

@@ -1,6 +1,6 @@
 REGISTRY_NAME?=docker.io/hashicorp
 IMAGE_NAME=vault-k8s
-VERSION?=0.2.0
+VERSION?=0.3.0
 IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(VERSION)
 IMAGE_TAG_LATEST=$(REGISTRY_NAME)/$(IMAGE_NAME):latest
 DOCKER_DIR=./build/docker

agent-inject/agent/agent.go

@@ -14,7 +14,7 @@ import (
 // TODO swap out 'github.com/mattbaird/jsonpatch' for 'github.com/evanphx/json-patch'
 
 const (
-	DefaultVaultImage      = "vault:1.3.1"
+	DefaultVaultImage      = "vault:1.3.2"
 	DefaultVaultAuthPath   = "auth/kubernetes"
 	DefaultAgentRunAsUser  = 100
 	DefaultAgentRunAsGroup = 1000

build/docker/Dockerfile.dev

@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ARG VERSION=0.2.0
+ARG VERSION=0.3.0
 
 RUN addgroup vault && \
     adduser -S -G vault vault

build/docker/Dockerfile.release

@@ -1,7 +1,7 @@
 FROM alpine:latest
 
 ARG NAME=vault-k8s
-ARG VERSION=0.2.0
+ARG VERSION=0.3.0
 
 # Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD
 ENV NAME=$NAME

deploy/injector-deployment.yaml

@@ -21,7 +21,7 @@ spec:
       serviceAccountName: "vault-injector"
       containers:
         - name: sidecar-injector
-          image: "hashicorp/vault-k8s:0.2.0"
+          image: "hashicorp/vault-k8s:0.3.0"
           imagePullPolicy: IfNotPresent
           env:
             - name: NAMESPACE
@@ -37,7 +37,7 @@ spec:
             - name: AGENT_INJECT_VAULT_ADDR
               value: "https://vault.$(NAMESPACE).svc:8200"
             - name: AGENT_INJECT_VAULT_IMAGE
-              value: "vault:1.3.1"
+              value: "vault:1.3.2"
             - name: AGENT_INJECT_TLS_AUTO
               value: vault-agent-injector-cfg
             - name: AGENT_INJECT_TLS_AUTO_HOSTS

subcommand/injector/flags_test.go

@@ -114,7 +114,7 @@ func TestCommandEnvs(t *testing.T) {
 		{env: "AGENT_INJECT_LISTEN", value: ":8080", cmdPtr: &cmd.flagListen},
 		{env: "AGENT_INJECT_VAULT_ADDR", value: "http://vault:8200", cmdPtr: &cmd.flagVaultService},
 		{env: "AGENT_INJECT_VAULT_AUTH_PATH", value: "auth-path-test", cmdPtr: &cmd.flagVaultAuthPath},
-		{env: "AGENT_INJECT_VAULT_IMAGE", value: "hashicorp/vault:1.3.1", cmdPtr: &cmd.flagVaultImage},
+		{env: "AGENT_INJECT_VAULT_IMAGE", value: "vault:1.3.2", cmdPtr: &cmd.flagVaultImage},
 		{env: "AGENT_INJECT_TLS_KEY_FILE", value: "server.key", cmdPtr: &cmd.flagKeyFile},
 		{env: "AGENT_INJECT_TLS_CERT_FILE", value: "server.crt", cmdPtr: &cmd.flagCertFile},
 		{env: "AGENT_INJECT_TLS_AUTO_HOSTS", value: "foobar.com", cmdPtr: &cmd.flagAutoHosts},

version/version.go

@@ -14,7 +14,7 @@ var (
 	//
 	// Version must conform to the format expected by
 	// github.com/hashicorp/go-version for tests to work.
-	Version = "0.2.0"
+	Version = "0.3.0"
 
 	// A pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release