Skip to content

Commit

Permalink
Preparing for v1.4.0 release (#600)
Browse files Browse the repository at this point in the history 
Updating Changelog, k8s versions, go version, and trusted actions
(except {upload,download}-artifact). Also use vault 1.15.6.
  • Loading branch information
@tvoran
tvoran authored Mar 4, 2024
1 parent e8a6673 commit 1a8db92
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 24 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
outputs:
product-version: ${{ steps.get-product-version.outputs.product-version }}
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: get product version
id: get-product-version
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
filepath: ${{ steps.generate-metadata-file.outputs.filepath }}
steps:
- name: 'Checkout directory'
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Generate metadata file
id: generate-metadata-file
uses: hashicorp/actions-generate-metadata@fdbc8803a0e53bcbb912ddeee3808329033d6357 # v1.1.1
Expand All @@ -59,10 +59,10 @@ jobs:
name: Go linux ${{ matrix.arch }} build

steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Setup go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version-file: .go-version

Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
version: ${{needs.get-product-version.outputs.product-version}}

steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Docker Build (Action)
uses: hashicorp/actions-docker-build@f6278ea21555b4b4737e4cf366e808ba2bb59146 # v1.6.1
with:
Expand All @@ -116,7 +116,7 @@ jobs:
version: ${{needs.get-product-version.outputs.product-version}}

steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: hashicorp/actions-docker-build@f6278ea21555b4b4737e4cf366e808ba2bb59146 # v1.6.1
with:
version: ${{env.version}}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
TARBALL_FILE: vault-k8s-image.docker.tar
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version-file: .go-version

Expand All @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kind-k8s-version: [1.24.15, 1.25.11, 1.26.6, 1.27.3, 1.28.0]
kind-k8s-version: [1.25.16, 1.26.14, 1.27.11, 1.28.7, 1.29.2]
runs-on: ubuntu-latest
steps:
# Setup test tools from https://github.com/hashicorp/vault-helm/blob/main/.github/workflows/setup-test-tools/action.yaml
Expand All @@ -52,15 +52,15 @@ jobs:
shell: bash

# Checkout this repo.
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
path: "vault-k8s"

# Checkout vault-helm for acceptance test code.
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
repository: "hashicorp/vault-helm"
ref: "v0.25.0"
ref: "v0.27.0"
path: "vault-helm"

- name: Create K8s Kind Cluster
Expand All @@ -69,7 +69,7 @@ jobs:
cluster_name: kind
config: vault-helm/test/kind/config.yaml
node_image: kindest/node:v${{ matrix.kind-k8s-version }}
version: v0.20.0
version: v0.22.0

- uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
with:
Expand Down
2 changes: 1 addition & 1 deletion .go-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.3
1.21.7
18 changes: 13 additions & 5 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
## Unreleased

## 1.4.0 (March 4, 2024)

Features:
* Add support for `max_connections_per_host` within Agent injector [GH-579](https://github.com/hashicorp/vault-k8s/pull/579)
* Add support for `error_on_missing_key` within Agent injector [GH-441](https://github.com/hashicorp/vault-k8s/pull/441)

Changes:
* Default Vault version updated to 1.15.6
* Building with Go 1.21.7
* Testing with K8s versions 1.25-1.29
* Dependency updates:
* Docker UBI image `ubi8/ubi-minimal` 8.8-1072.1697626218 => 8.9-1137
* Docker alpine version 3.18.4 => 3.19.0
* `k8s.io/api` v0.28.3 => v0.29.1
* `k8s.io/apimachinery` v0.28.3 => v0.29.1
* `k8s.io/client-go` v0.28.3 => v0.29.1
* Docker alpine version 3.18.4 => 3.19.1
* `k8s.io/api` v0.28.3 => v0.29.2
* `k8s.io/apimachinery` v0.28.3 => v0.29.2
* `k8s.io/client-go` v0.28.3 => v0.29.2
* `k8s.io/utils` v0.0.0-20230406110748-d93618cff8a2 => v0.0.0-20230726121419-3b25d923346b`
* `github.com/hashicorp/go-hclog` v1.5.0 => v1.6.2
* `github.com/hashicorp/go-secure-stdlib/tlsutil` v0.1.2 => v0.1.3
* `github.com/hashicorp/vault/sdk` v0.10.2 => v0.11.0
* `github.com/prometheus/client_golang` v1.17.0 => v1.18.0
* `github.com/prometheus/client_golang` v1.17.0 => v1.19.0
* `github.com/operator-framework/operator-lib` v0.11.0 => v0.12.0
* `github.com/evanphx/json-patch` v5.7.0 => v5.9.0
* `github.com/stretchr/testify` v1.8.4 => v1.9.0

## 1.3.1 (October 25, 2023)

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PKG=github.com/hashicorp/vault-k8s/version
LDFLAGS?="-X '$(PKG).Version=v$(VERSION)'"
TESTARGS ?= '-test.v'

VAULT_HELM_CHART_VERSION ?= 0.25.0
VAULT_HELM_CHART_VERSION ?= 0.27.0
VAULT_HELM_FLAGS?=--repo https://helm.releases.hashicorp.com --version=$(VAULT_HELM_CHART_VERSION) \
--wait --timeout=5m \
--values=test/vault/dev.values.yaml \
Expand Down
2 changes: 1 addition & 1 deletion agent-inject/agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
)

const (
DefaultVaultImage = "hashicorp/vault:1.15.1"
DefaultVaultImage = "hashicorp/vault:1.15.6"
DefaultVaultAuthType = "kubernetes"
DefaultVaultAuthPath = "auth/kubernetes"
DefaultAgentRunAsUser = 100
Expand Down
4 changes: 2 additions & 2 deletions deploy/injector-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
serviceAccountName: "vault-injector"
containers:
- name: sidecar-injector
image: "hashicorp/vault-k8s:1.3.1"
image: "hashicorp/vault-k8s:1.4.0"
imagePullPolicy: IfNotPresent
env:
- name: NAMESPACE
Expand All @@ -44,7 +44,7 @@ spec:
- name: AGENT_INJECT_VAULT_ADDR
value: "https://vault.$(NAMESPACE).svc:8200"
- name: AGENT_INJECT_VAULT_IMAGE
value: "hashicorp/vault:1.15.1"
value: "hashicorp/vault:1.15.6"
- name: AGENT_INJECT_TLS_AUTO
value: vault-agent-injector-cfg
- name: AGENT_INJECT_TLS_AUTO_HOSTS
Expand Down
2 changes: 1 addition & 1 deletion subcommand/injector/flags_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func TestCommandEnvs(t *testing.T) {
{env: "AGENT_INJECT_VAULT_CACERT_BYTES", value: "foo", cmdPtr: &cmd.flagVaultCACertBytes},
{env: "AGENT_INJECT_PROXY_ADDR", value: "http://proxy:3128", cmdPtr: &cmd.flagProxyAddress},
{env: "AGENT_INJECT_VAULT_AUTH_PATH", value: "auth-path-test", cmdPtr: &cmd.flagVaultAuthPath},
{env: "AGENT_INJECT_VAULT_IMAGE", value: "hashicorp/vault:1.15.1", cmdPtr: &cmd.flagVaultImage},
{env: "AGENT_INJECT_VAULT_IMAGE", value: "hashicorp/vault:1.15.6", cmdPtr: &cmd.flagVaultImage},
{env: "AGENT_INJECT_VAULT_NAMESPACE", value: "test-namespace", cmdPtr: &cmd.flagVaultNamespace},
{env: "AGENT_INJECT_TLS_KEY_FILE", value: "server.key", cmdPtr: &cmd.flagKeyFile},
{env: "AGENT_INJECT_TLS_CERT_FILE", value: "server.crt", cmdPtr: &cmd.flagCertFile},
Expand Down

0 comments on commit 1a8db92

Please sign in to comment.