Skip to content

Commit a861a2d

Browse files
authored
chore: moved example out of default ns, will help audit later (terraform-google-modules#976)
1 parent bb36cbf commit a861a2d

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

examples/acm-terraform-blog-part1/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Subsequent articles will discuss other aspects of ACM to manage your GCP infrast
6363
kubectl proxy --port 8888 &
6464
6565
# curl or use the browser
66-
curl http://127.0.0.1:8888/api/v1/namespaces/default/services/wordpress/proxy/wp-admin/install.php
66+
curl http://127.0.0.1:8888/api/v1/namespaces/wp/services/wordpress/proxy/wp-admin/install.php
6767
6868
```
6969

examples/acm-terraform-blog-part1/config-root/wordpress-bundle.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
14+
apiVersion: v1
15+
kind: Namespace
16+
metadata:
17+
name: wp
18+
---
1519
apiVersion: v1
1620
kind: ConfigMap
1721
metadata:
22+
namespace: wp
1823
name: wp-config
1924
data:
2025
### We're using a ConfigMap for simplicity, but in real life one should
@@ -24,6 +29,7 @@ data:
2429
apiVersion: v1
2530
kind: Service
2631
metadata:
32+
namespace: wp
2733
name: wordpress-mysql
2834
labels:
2935
app: wordpress
@@ -38,6 +44,7 @@ spec:
3844
apiVersion: v1
3945
kind: PersistentVolumeClaim
4046
metadata:
47+
namespace: wp
4148
name: mysql-pvc
4249
labels:
4350
app: wordpress
@@ -51,6 +58,7 @@ spec:
5158
apiVersion: apps/v1
5259
kind: Deployment
5360
metadata:
61+
namespace: wp
5462
name: wordpress-mysql
5563
labels:
5664
app: wordpress
@@ -90,6 +98,7 @@ spec:
9098
apiVersion: v1
9199
kind: Service
92100
metadata:
101+
namespace: wp
93102
name: wordpress
94103
labels:
95104
app: wordpress
@@ -103,6 +112,7 @@ spec:
103112
apiVersion: v1
104113
kind: PersistentVolumeClaim
105114
metadata:
115+
namespace: wp
106116
name: wp-pvc
107117
labels:
108118
app: wordpress
@@ -116,6 +126,7 @@ spec:
116126
apiVersion: apps/v1
117127
kind: Deployment
118128
metadata:
129+
namespace: wp
119130
name: wordpress
120131
labels:
121132
app: wordpress

examples/acm-terraform-blog-part2/config-root/wordpress-bundle.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2018 Google LLC
1+
# Copyright 2021 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -11,10 +11,15 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
14+
apiVersion: v1
15+
kind: Namespace
16+
metadata:
17+
name: wp
18+
---
1519
apiVersion: v1
1620
kind: ConfigMap
1721
metadata:
22+
namespace: wp
1823
name: wp-config
1924
data:
2025
### We're using a ConfigMap for simplicity, but in real life one should
@@ -24,6 +29,7 @@ data:
2429
apiVersion: v1
2530
kind: Service
2631
metadata:
32+
namespace: wp
2733
name: wordpress-mysql
2834
labels:
2935
app: wordpress
@@ -38,6 +44,7 @@ spec:
3844
apiVersion: v1
3945
kind: PersistentVolumeClaim
4046
metadata:
47+
namespace: wp
4148
name: mysql-pvc
4249
labels:
4350
app: wordpress
@@ -51,6 +58,7 @@ spec:
5158
apiVersion: apps/v1
5259
kind: Deployment
5360
metadata:
61+
namespace: wp
5462
name: wordpress-mysql
5563
labels:
5664
app: wordpress
@@ -90,6 +98,7 @@ spec:
9098
apiVersion: v1
9199
kind: Service
92100
metadata:
101+
namespace: wp
93102
name: wordpress
94103
labels:
95104
app: wordpress
@@ -103,6 +112,7 @@ spec:
103112
apiVersion: v1
104113
kind: PersistentVolumeClaim
105114
metadata:
115+
namespace: wp
106116
name: wp-pvc
107117
labels:
108118
app: wordpress
@@ -116,6 +126,7 @@ spec:
116126
apiVersion: apps/v1
117127
kind: Deployment
118128
metadata:
129+
namespace: wp
119130
name: wordpress
120131
labels:
121132
app: wordpress

0 commit comments

Comments
 (0)