Merge pull request #1102 from apichick/hybrid-gke-updates

Improvements in apigee hybrid-gke: now using workload identity and GLB
GoogleCloudPlatform · Jan 20, 2023 · a17863c · a17863c
2 parents fef45ed + 6a63339
commit a17863c
Show file tree

Hide file tree

Showing 13 changed files with 422 additions and 106 deletions.
diff --git a/blueprints/apigee/hybrid-gke/README.md b/blueprints/apigee/hybrid-gke/README.md
@@ -25,20 +25,20 @@ The diagram below depicts the architecture.
     terraform apply
     ```
 
+Create an A record in your DNS registrar to point the environment group hostname to the public IP address returned after the terraform configuration was applied. You might need to wait some time until the certificate is provisioned.    
+
 ## Testing the blueprint
 
 2. Deploy an api proxy
 
     ```
-    ./deploy-apiproxy.sh
+    ./deploy-apiproxy.sh apis-test
     ```
 
-3. In the console check the IP address that has been allocated to the Apigee ingress gateway and send some traffic to the deployed API proxy.
+3. Send a request
 
     ```
-    curl -k -v -H "Host:HOSTNAME" \
-    --resolve HOSTNAME:443:IP_ADDRESS \
-    https://HOSTNAME/httpbin/headers
+    curl -v https://HOSTNAME/httpbin/headers
     ```
 <!-- BEGIN TFDOC -->
 
@@ -56,4 +56,10 @@ The diagram below depicts the architecture.
 | [region](variables.tf#L84) | Region. | <code>string</code> |  | <code>&#34;europe-west1&#34;</code> |
 | [zone](variables.tf#L90) | Zone. | <code>string</code> |  | <code>&#34;europe-west1-c&#34;</code> |
 
+## Outputs
+
+| name | description | sensitive |
+|---|---|:---:|
+| [ip_address](outputs.tf#L17) | GLB IP address. |  |
+
 <!-- END TFDOC -->
diff --git a/blueprints/apigee/hybrid-gke/ansible.tf b/blueprints/apigee/hybrid-gke/ansible.tf
@@ -18,12 +18,13 @@
 
 resource "local_file" "vars_file" {
   content = yamlencode({
-    cluster    = module.cluster.name
-    region     = var.region
-    project_id = module.project.project_id
-    envgroup   = local.envgroup
-    env        = local.environment
-    hostname   = var.hostname
+    cluster          = module.cluster.name
+    region           = var.region
+    project_id       = module.project.project_id
+    envgroups        = local.envgroups
+    environments     = local.environments
+    service_accounts = local.google_sas
+    ingress_ip_name  = local.ingress_ip_name
   })
   filename        = "${path.module}/ansible/vars/vars.yaml"
   file_permission = "0666"

diff --git a/blueprints/apigee/hybrid-gke/ansible/roles/apigee-hybrid/tasks/k8s_service_accounts.yaml b/blueprints/apigee/hybrid-gke/ansible/roles/apigee-hybrid/tasks/k8s_service_accounts.yaml
@@ -0,0 +1,28 @@
+# Copyright 2023 Google LLC
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Create and annotate k8s service account
+  kubernetes.core.k8s:
+    state: present
+    definition: 
+      apiVersion: v1
+      kind: ServiceAccount
+      metadata:
+        name: "{{ k8s_service_account }}"
+        namespace: apigee
+        annotations:
+          iam.gke.io/gcp-service-account: "{{ google_service_account }}@{{ project_id }}.iam.gserviceaccount.com"
+  with_items: "{{ k8s_service_accounts }}"  
+  loop_control:
+    loop_var: k8s_service_account