chore: moved example out of default ns, will help audit later (#976)

terraform-google-modules · Aug 14, 2021 · a861a2d · a861a2d
1 parent bb36cbf
commit a861a2d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/examples/acm-terraform-blog-part1/README.md b/examples/acm-terraform-blog-part1/README.md
@@ -63,7 +63,7 @@ Subsequent articles will discuss other aspects of ACM to manage your GCP infrast
     kubectl proxy --port 8888 &
 
     # curl or use the browser
-    curl http://127.0.0.1:8888/api/v1/namespaces/default/services/wordpress/proxy/wp-admin/install.php
+    curl http://127.0.0.1:8888/api/v1/namespaces/wp/services/wordpress/proxy/wp-admin/install.php
 
     ```
 

diff --git a/examples/acm-terraform-blog-part1/config-root/wordpress-bundle.yaml b/examples/acm-terraform-blog-part1/config-root/wordpress-bundle.yaml
@@ -11,10 +11,15 @@
 # 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.
-
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: wp
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  namespace: wp
   name: wp-config
 data:
   ### We're using a ConfigMap for simplicity, but in real life one should
@@ -24,6 +29,7 @@ data:
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: wp
   name: wordpress-mysql
   labels:
     app: wordpress
@@ -38,6 +44,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  namespace: wp
   name: mysql-pvc
   labels:
     app: wordpress
@@ -51,6 +58,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: wp
   name: wordpress-mysql
   labels:
     app: wordpress
@@ -90,6 +98,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: wp
   name: wordpress
   labels:
     app: wordpress
@@ -103,6 +112,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  namespace: wp
   name: wp-pvc
   labels:
     app: wordpress
@@ -116,6 +126,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: wp
   name: wordpress
   labels:
     app: wordpress

diff --git a/examples/acm-terraform-blog-part2/config-root/wordpress-bundle.yaml b/examples/acm-terraform-blog-part2/config-root/wordpress-bundle.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,10 +11,15 @@
 # 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.
-
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: wp
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  namespace: wp
   name: wp-config
 data:
   ### We're using a ConfigMap for simplicity, but in real life one should
@@ -24,6 +29,7 @@ data:
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: wp
   name: wordpress-mysql
   labels:
     app: wordpress
@@ -38,6 +44,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  namespace: wp
   name: mysql-pvc
   labels:
     app: wordpress
@@ -51,6 +58,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: wp
   name: wordpress-mysql
   labels:
     app: wordpress
@@ -90,6 +98,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: wp
   name: wordpress
   labels:
     app: wordpress
@@ -103,6 +112,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  namespace: wp
   name: wp-pvc
   labels:
     app: wordpress
@@ -116,6 +126,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: wp
   name: wordpress
   labels:
     app: wordpress