fix: fixing production environment drift (#250)

GoogleCloudPlatform · Sep 27, 2024 · 9c1b05b · 9c1b05b
1 parent d31f750
commit 9c1b05b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 20 deletions.
diff --git a/3-fleetscope/modules/env_baseline/main.tf b/3-fleetscope/modules/env_baseline/main.tf
@@ -40,6 +40,10 @@ resource "google_gke_hub_namespace" "fleet-ns" {
   scope_id           = google_gke_hub_scope.fleet-scope[each.key].scope_id
   scope              = google_gke_hub_scope.fleet-scope[each.key].name
   project            = google_gke_hub_scope.fleet-scope[each.key].project
+
+  labels = {
+    "istio-injection" = "enabled"
+  }
 }
 
 resource "google_gke_hub_membership_binding" "membership-binding" {

diff --git a/.../overlays/production/destinationrule.yaml → ...n-asm-configurations/destinationrule.yaml b/.../overlays/production/destinationrule.yaml → ...n-asm-configurations/destinationrule.yaml
@@ -17,7 +17,7 @@ kind: DestinationRule
 metadata:
   name: frontend
 spec:
-  host: frontend.frontend-production.svc.cluster.local
+  host: frontend.cb-frontend-production.svc.cluster.local
   trafficPolicy:
     connectionPool:
       http:

diff --git a/...tend/k8s/overlays/production/gateway.yaml → ...roduction-asm-configurations/gateway.yaml b/...tend/k8s/overlays/production/gateway.yaml → ...roduction-asm-configurations/gateway.yaml
diff --git a/...tend/k8s/overlays/production/ingress.yaml → ...roduction-asm-configurations/ingress.yaml b/...tend/k8s/overlays/production/ingress.yaml → ...roduction-asm-configurations/ingress.yaml
diff --git a/...nd/k8s/overlays/production/namespace.yaml → ...ion-asm-configurations/kustomization.yaml b/...nd/k8s/overlays/production/namespace.yaml → ...ion-asm-configurations/kustomization.yaml
@@ -11,9 +11,10 @@
 # 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: frontend-production
-  labels:
-    istio-injection: enabled # enable ASM sidecar injection on namespace
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - gateway.yaml
+  - ingress.yaml
+  - destinationrule.yaml
diff --git a/6-appsource/cymbal-bank/frontend/k8s/overlays/production/kustomization.yaml b/6-appsource/cymbal-bank/frontend/k8s/overlays/production/kustomization.yaml
@@ -14,20 +14,8 @@
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: frontend-production
+namespace: cb-frontend-production
 resources:
   - ../../base
-  - gateway.yaml
-  - ingress.yaml
-  - namespace.yaml
-  - destinationrule.yaml
 components:
   - ../../../../components/production
-transformers:
-  - |-
-    apiVersion: builtin
-    kind: NamespaceTransformer
-    metadata:
-      name: notImportantHere
-      namespace: cb-frontend-production
-    unsetOnly: true
diff --git a/6-appsource/cymbal-bank/frontend/skaffold.yaml b/6-appsource/cymbal-bank/frontend/skaffold.yaml
@@ -61,3 +61,4 @@ profiles:
     kustomize:
       paths:
       - k8s/overlays/production
+      - k8s/overlays/production-asm-configurations