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

Jump to bottom

Adapt scripts to avoid fields removed in provider v4.0.0 #103

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adapt scripts to avoid fields removed in provider v4.0.0 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions terraform/gcp.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ resource "google_container_cluster" "vault" {

# Protect node metadata
workload_metadata_config {
node_metadata = "SECURE"
mode = "GCE_METADATA"
}
}

Expand All @@ -290,8 +290,6 @@ resource "google_container_cluster" "vault" {

# Disable basic authentication and cert-based authentication.
master_auth {
username = ""
password = ""

client_certificate_config {
issue_client_certificate = false
Expand Down
3 changes: 0 additions & 3 deletions terraform/tls.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ resource "tls_private_key" "vault-ca" {
}

resource "tls_self_signed_cert" "vault-ca" {
key_algorithm = tls_private_key.vault-ca.algorithm
private_key_pem = tls_private_key.vault-ca.private_key_pem

subject {
Expand Down Expand Up @@ -36,7 +35,6 @@ resource "tls_private_key" "vault" {

# Create the request to sign the cert with our CA
resource "tls_cert_request" "vault" {
key_algorithm = tls_private_key.vault.algorithm
private_key_pem = tls_private_key.vault.private_key_pem

dns_names = [
Expand All @@ -59,7 +57,6 @@ resource "tls_cert_request" "vault" {
resource "tls_locally_signed_cert" "vault" {
cert_request_pem = tls_cert_request.vault.cert_request_pem

ca_key_algorithm = tls_private_key.vault-ca.algorithm
ca_private_key_pem = tls_private_key.vault-ca.private_key_pem
ca_cert_pem = tls_self_signed_cert.vault-ca.cert_pem

Expand Down