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

Make sure vault integration works with PSPs #985

Merged
merged 3 commits into from
Jan 21, 2022
Merged

Make sure vault integration works with PSPs #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25132fc
Make sure vault integration works with PSPs
ishustava Jan 20, 2022
db4c707
update changelog
ishustava Jan 20, 2022
d561532
update circleci config
ishustava Jan 20, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ IMPROVEMENTS:
* Allow customization of `terminationGracePeriodSeconds` on the ingress gateways. [[GH-947](https://github.com/hashicorp/consul-k8s/pull/947)]
* Support `ui.dashboardURLTemplates.service` value for setting [dashboard URL templates](https://www.consul.io/docs/agent/options#ui_config_dashboard_url_templates_service). [[GH-937](https://github.com/hashicorp/consul-k8s/pull/937)]
* Allow using dash-separated names for config entries when using `kubectl`. [[GH-965](https://github.com/hashicorp/consul-k8s/pull/965)]
* Support Pod Security Policies with Vault integration. [[GH-985](https://github.com/hashicorp/consul-k8s/pull/985)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💥

* Control Plane
* Support the value `$POD_NAME` for the annotation `consul.hashicorp.com/service-meta-pod_name` that will now be interpolated and set to the pod name in the service's metadata. [[GH-982](https://github.com/hashicorp/consul-k8s/pull/982)]

Expand Down
3 changes: 0 additions & 3 deletions acceptance/tests/vault/vault_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ path "pki/cert/ca" {
// It then configures Consul to use vault as the backend and checks that it works.
func TestVault(t *testing.T) {
cfg := suite.Config()
if cfg.EnablePodSecurityPolicies {
t.Skipf("skipping this test because PSPs don't yet work with the acceptance test Vault installation")
}
ctx := suite.Environment().DefaultContext(t)
ns := ctx.KubectlOptions(t).Namespace

Expand Down
1 change: 1 addition & 0 deletions charts/consul/templates/server-acl-init-podsecuritypolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
# Allow core volume types.
volumes:
- 'secret'
- 'emptyDir'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GENIUS! pure unadulterated genius.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

allowPrivilegeEscalation: false
# This is redundant with non-root + disallow privilege escalation,
# but we can provide it for defense in depth.
Expand Down
3 changes: 2 additions & 1 deletion charts/consul/test/terraform/gke/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ resource "google_container_cluster" "cluster" {
min_master_version = data.google_container_engine_versions.main.latest_master_version
node_version = data.google_container_engine_versions.main.latest_master_version
node_config {
tags = ["consul-k8s-${random_id.suffix[count.index].dec}"]
tags = ["consul-k8s-${random_id.suffix[count.index].dec}"]
machine_type = "e2-standard-4"
}
pod_security_policy_config {
enabled = true
Expand Down