Skip to content
This repository was archived by the owner on May 7, 2025. It is now read-only.

Commit 3ccb4a3

Browse files
author
Mathieu Benoit
committed
Fix git commit for allow-memorystore in onlineboutique + implement depends-on
1 parent 86c8d1d commit 3ccb4a3

File tree

2 files changed

+82
-2
lines changed

2 files changed

+82
-2
lines changed

content/onlineboutique/allow-memorystore.md

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1
1919
kind: Service
2020
metadata:
2121
annotations:
22-
cnrm.cloud.google.com/project-id: ${GKE_PROJECT_ID}
2322
cnrm.cloud.google.com/deletion-policy: "abandon"
2423
cnrm.cloud.google.com/disable-dependent-services: "false"
25-
name: redis.googleapis.com
24+
config.kubernetes.io/depends-on: resourcemanager.cnrm.cloud.google.com/namespaces/config-control/Project/${GKE_PROJECT_ID}
25+
name: ${GKE_PROJECT_ID}-redis
2626
namespace: config-control
27+
spec:
28+
projectRef:
29+
name: ${GKE_PROJECT_ID}
30+
resourceID: redis.googleapis.com
2731
EOF
2832
```
2933

@@ -37,6 +41,8 @@ kind: IAMPolicyMember
3741
metadata:
3842
name: redis-admin-${GKE_PROJECT_ID}
3943
namespace: config-control
44+
annotations:
45+
config.kubernetes.io/depends-on: iam.cnrm.cloud.google.com/namespaces/config-control/IAMServiceAccount/${GKE_PROJECT_ID},resourcemanager.cnrm.cloud.google.com/namespaces/config-control/Project/${GKE_PROJECT_ID}
4046
spec:
4147
memberFrom:
4248
serviceAccountRef:
@@ -107,6 +113,47 @@ EOF
107113

108114
## Deploy Kubernetes manifests
109115

116+
```Bash
117+
cd ~/$WORKSHOP_ORG_DIR_NAME/
118+
git add .
119+
git commit -m "Allow Security for GKE project"
120+
git push origin main
121+
```
122+
123+
## Check deployments
124+
125+
{{< mermaid >}}
126+
graph TD;
127+
IAMServiceAccount-->Project
128+
IAMPartialPolicy-->IAMServiceAccount
129+
ConfigConnectorContext-->IAMServiceAccount
130+
IAMPolicyMember-->IAMServiceAccount
131+
IAMPolicyMember-->Project
132+
IAMPolicyMember-->IAMServiceAccount
133+
IAMPolicyMember-->Project
134+
IAMPolicyMember-->IAMServiceAccount
135+
IAMPolicyMember-->Project
136+
IAMPolicyMember-->IAMServiceAccount
137+
IAMPolicyMember-->Project
138+
IAMPolicyMember-->IAMServiceAccount
139+
IAMPolicyMember-->Project
140+
Service-->Project
141+
IAMPolicyMember-->IAMServiceAccount
142+
IAMPolicyMember-->Project
143+
Service-->Project
144+
Service-->Project
145+
IAMPolicyMember-->IAMServiceAccount
146+
IAMPolicyMember-->Project
147+
Service-->Project
148+
Service-->Project
149+
Service-->Project
150+
Service-->Project
151+
IAMPolicyMember-->IAMServiceAccount
152+
IAMPolicyMember-->Project
153+
Service-->Project
154+
IAMPolicyMember-->IAMServiceAccount
155+
{{< /mermaid >}}
156+
110157
List the GCP resources created:
111158
```Bash
112159
gcloud projects get-iam-policy $GKE_PROJECT_ID \

content/onlineboutique/set-up-memorystore.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ kind: RedisInstance
2626
metadata:
2727
name: ${REDIS_NAME}
2828
namespace: ${GKE_PROJECT_ID}
29+
annotations:
30+
config.kubernetes.io/depends-on: compute.cnrm.cloud.google.com/namespaces/${GKE_PROJECT_ID}/ComputeNetwork/${GKE_NAME}
2931
spec:
3032
region: ${GKE_LOCATION}
3133
tier: BASIC
@@ -59,6 +61,37 @@ echo "export REDIS_PORT=${REDIS_PORT}" >> ~/acm-workshop-variables.sh
5961

6062
## Check deployments
6163

64+
{{< mermaid >}}
65+
graph TD;
66+
ComputeNetwork-.->Project
67+
IAMServiceAccount-.->Project
68+
GKEHubFeature-.->Project
69+
ArtifactRegistryRepository-.->Project
70+
GKEHubFeature-.->Project
71+
ComputeAddress-.->Project
72+
ComputeSecurityPolicy-.->Project
73+
ComputeSSLPolicy-.->Project
74+
ComputeSubnetwork-->ComputeNetwork
75+
ComputeRouterNAT-->ComputeSubnetwork
76+
ComputeRouterNAT-->ComputeRouter
77+
ComputeRouter-->ComputeNetwork
78+
ContainerNodePool-->ContainerCluster
79+
ContainerNodePool-->IAMServiceAccount
80+
IAMPolicyMember-->IAMServiceAccount
81+
IAMPolicyMember-->IAMServiceAccount
82+
IAMPolicyMember-->IAMServiceAccount
83+
IAMPolicyMember-->IAMServiceAccount
84+
IAMPartialPolicy-->IAMServiceAccount
85+
ContainerCluster-->ComputeSubnetwork
86+
GKEHubFeatureMembership-->GKEHubMembership
87+
GKEHubFeatureMembership-->GKEHubFeature
88+
GKEHubMembership-->ContainerCluster
89+
IAMPolicyMember-->ArtifactRegistryRepository
90+
IAMPolicyMember-->IAMServiceAccount
91+
RedisInstance-.->Project
92+
RedisInstance-->ComputeNetwork
93+
{{< /mermaid >}}
94+
6295
List the GCP resources created:
6396
```Bash
6497
gcloud redis instances list \

0 commit comments

Comments
 (0)