Skip to content

Commit fcd65d3

Browse files
authored
Merge pull request hashicorp#121 from hashicorp/fix-gke-and-cats-and-dogs
fixed GKE and c-&-d
2 parents 7bd3be8 + aa1e793 commit fcd65d3

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

infrastructure-as-code/k8s-cluster-gke/main.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ resource "google_container_cluster" "k8sexample" {
2727
master_auth {
2828
username = "${var.master_username}"
2929
password = "${var.master_password}"
30+
31+
client_certificate_config {
32+
issue_client_certificate = true
33+
}
3034
}
3135

3236
node_config {

self-serve-infrastructure/cats-and-dogs/backend/vote-db/start_redis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# Authenticate against Vault
3-
login_result=$(curl --request POST --data '{"role": "demo", "jwt": "'"${K8S_TOKEN}"'"}' ${VAULT_ADDR}/v1/auth/${VAULT_K8S_BACKEND}login)
3+
login_result=$(curl --request POST --data '{"role": "demo", "jwt": "'"${K8S_TOKEN}"'"}' ${VAULT_ADDR}/v1/auth/${VAULT_K8S_BACKEND}/login)
44

55
# Read cats-and-dogs secret from Vault
66
vault_token=$(echo $login_result | python3 -c "import sys, json; print(json.load(sys.stdin)['auth']['client_token'])")

self-serve-infrastructure/cats-and-dogs/frontend/azure-vote/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
try:
2020
client = hvac.Client(url=os.environ['VAULT_ADDR'])
2121
params = {'role':'demo', 'jwt':os.environ['K8S_TOKEN']}
22-
result = client.auth('/v1/auth/' + os.environ['VAULT_K8S_BACKEND'] + 'login', json=params)
22+
result = client.auth('/v1/auth/' + os.environ['VAULT_K8S_BACKEND'] + '/login', json=params)
2323
print(result)
2424

2525
# Redis configurations

0 commit comments

Comments
 (0)