Change 'phase' back to 'environment'!

hello-cloudbuild/k8s/demo/production-values.yaml

@@ -1 +1 @@
-phase: production
+environment: production

hello-cloudbuild/k8s/demo/staging-values.yaml

@@ -1 +1 @@
-phase: staging
+environment: staging

hello-cloudbuild/k8s/demo/templates/deployment.yaml

@@ -8,14 +8,14 @@ spec:
     metadata:
       labels:
         app: {{ .Values.container.name }}
-        phase: {{ .Values.phase }}
+        environment: {{ .Values.environment }}
     spec:
       containers:
         - name: {{ .Values.container.name }}
           image: {{ .Values.container.image }}:{{ .Values.container.tag }}
           ports:
             - containerPort: {{ .Values.container.port }}
           env:
-            - name: PHASE
-              value: {{ .Values.phase }}
+            - name: environment
+              value: {{ .Values.environment }}
 

hello-cloudbuild/k8s/demo/values.yaml

@@ -1,4 +1,4 @@
-phase: development
+environment: development
 container:
   name: demo
   port: 8888

hello-drone/k8s/demo/production-values.yaml

@@ -1 +1 @@
-phase: production
+environment: production

hello-drone/k8s/demo/staging-values.yaml

@@ -1 +1 @@
-phase: staging
+environment: staging

hello-drone/k8s/demo/templates/deployment.yaml

@@ -8,14 +8,14 @@ spec:
     metadata:
       labels:
         app: {{ .Values.container.name }}
-        phase: {{ .Values.phase }}
+        environment: {{ .Values.environment }}
     spec:
       containers:
         - name: {{ .Values.container.name }}
           image: {{ .Values.container.image }}:{{ .Values.container.tag }}
           ports:
             - containerPort: {{ .Values.container.port }}
           env:
-            - name: PHASE
-              value: {{ .Values.phase }}
+            - name: environment
+              value: {{ .Values.environment }}
 

hello-drone/k8s/demo/values.yaml

@@ -1,4 +1,4 @@
-phase: development
+environment: development
 container:
   name: demo
   port: 8888

hello-helm/k8s/demo/production-values.yaml

@@ -1 +1 @@
-phase: production
+environment: production

hello-helm/k8s/demo/staging-values.yaml

@@ -1 +1 @@
-phase: staging
+environment: staging

hello-helm/k8s/demo/templates/deployment.yaml

@@ -8,14 +8,14 @@ spec:
     metadata:
       labels:
         app: {{ .Values.container.name }}
-        phase: {{ .Values.phase }}
+        environment: {{ .Values.environment }}
     spec:
       containers:
         - name: {{ .Values.container.name }}
           image: {{ .Values.container.image }}:{{ .Values.container.tag }}
           ports:
             - containerPort: {{ .Values.container.port }}
           env:
-            - name: PHASE
-              value: {{ .Values.phase }}
+            - name: environment
+              value: {{ .Values.environment }}
 

hello-helm/k8s/demo/templates/service.yaml

@@ -6,9 +6,9 @@ metadata:
     app: {{ .Values.container.name }}
 spec:
   ports:
-  - port: {{ .Values.container.port }}
+  - port: 80
     protocol: TCP
     targetPort: {{ .Values.container.port }}
   selector:
     app: {{ .Values.container.name }}
-  type: ClusterIP
+  type: LoadBalancer

hello-helm/k8s/demo/values.yaml

@@ -1,4 +1,4 @@
-phase: development
+environment: development
 container:
   name: demo
   port: 8888

hello-skaffold/k8s/demo/production-values.yaml

@@ -1 +1 @@
-phase: production
+environment: production

hello-skaffold/k8s/demo/staging-values.yaml

@@ -1 +1 @@
-phase: staging
+environment: staging

hello-skaffold/k8s/demo/templates/deployment.yaml

@@ -8,14 +8,14 @@ spec:
     metadata:
       labels:
         app: {{ .Values.container.name }}
-        phase: {{ .Values.phase }}
+        environment: {{ .Values.environment }}
     spec:
       containers:
         - name: {{ .Values.container.name }}
           image: {{ .Values.container.image }}:{{ .Values.container.tag }}
           ports:
             - containerPort: {{ .Values.container.port }}
           env:
-            - name: PHASE
-              value: {{ .Values.phase }}
+            - name: environment
+              value: {{ .Values.environment }}
 

hello-skaffold/k8s/demo/values.yaml

@@ -1,4 +1,4 @@
-phase: development
+environment: development
 image:
   repository: demo
   tag: hello

hello-sops/k8s/demo/production-values.yaml

@@ -1 +1 @@
-phase: production
+environment: production

hello-sops/k8s/demo/staging-values.yaml

@@ -1 +1 @@
-phase: staging
+environment: staging

hello-sops/k8s/demo/templates/deployment.yaml

@@ -8,7 +8,7 @@ spec:
     metadata:
       labels:
         app: {{ .Values.container.name }}
-        phase: {{ .Values.phase }}
+        environment: {{ .Values.environment }}
     spec:
       containers:
         - name: {{ .Values.container.name }}

hello-sops/k8s/demo/templates/secrets.yaml

@@ -4,5 +4,5 @@ metadata:
   name: {{ .Values.container.name }}-secrets
 type: Opaque
 data:
-  {{ $phase := .Values.phase }}
-  secrets.yaml: {{ .Files.Get (nospace (cat $phase "-secrets.yaml")) | b64enc }}
+  {{ $environment := .Values.environment }}
+  secrets.yaml: {{ .Files.Get (nospace (cat $environment "-secrets.yaml")) | b64enc }}

hello-sops/k8s/demo/values.yaml

@@ -1,4 +1,4 @@
-phase: development
+environment: development
 container:
   name: demo
   port: 8888

terraform/aws/bucket/01/main.tf

@@ -5,7 +5,7 @@ resource "aws_s3_bucket" "bucket" {
   acl    = "private"
 
   tags {
-    App   = "demo"
-    Phase = "test"
+    App         = "demo"
+    environment = "test"
   }
 }

terraform/aws/bucket/02/main.tf

@@ -1,11 +1,11 @@
 provider "aws" {}
 
 resource "aws_s3_bucket" "bucket" {
-  bucket = "${var.phase}-${var.your_name}-cloudnativedevops-${var.name}-bucket"
+  bucket = "${var.environment}-${var.your_name}-cloudnativedevops-${var.name}-bucket"
   acl    = "private"
 
   tags {
-    App   = "${var.name}"
-    Phase = "${var.phase}"
+    App         = "${var.name}"
+    environment = "${var.environment}"
   }
 }

terraform/aws/bucket/02/variables.tf

@@ -2,7 +2,7 @@ variable "name" {
   default = "demo"
 }
 
-variable "phase" {
+variable "environment" {
   default = "test"
 }
 

terraform/aws/bucket/03/main.tf

@@ -1,11 +1,11 @@
 provider "aws" {}
 
 resource "aws_s3_bucket" "bucket" {
-  bucket = "${var.phase}-${var.your_name}-cloudnativedevops-${var.name}-bucket"
+  bucket = "${var.environment}-${var.your_name}-cloudnativedevops-${var.name}-bucket"
   acl    = "private"
 
   tags {
-    App   = "${var.name}"
-    Phase = "${var.phase}"
+    App         = "${var.name}"
+    environment = "${var.environment}"
   }
 }

terraform/aws/bucket/03/production.tfvars

@@ -1 +1 @@
-phase = "production"
+environment = "production"

terraform/aws/bucket/03/staging.tfvars

@@ -1 +1 @@
-phase = "staging"
+environment = "staging"

terraform/aws/bucket/03/variables.tf

@@ -2,7 +2,7 @@ variable "name" {
   default = "demo"
 }
 
-variable "phase" {
+variable "environment" {
   default = "test"
 }
 

terraform/aws/database/main.tf

@@ -9,7 +9,7 @@ resource "aws_rds_cluster" "db" {
   skip_final_snapshot = true
 
   tags {
-    App   = "${var.name}"
-    Phase = "${var.phase}"
+    App         = "${var.name}"
+    environment = "${var.environment}"
   }
 }

terraform/aws/database/variables.tf

@@ -2,6 +2,6 @@ variable "name" {
   default = "demo"
 }
 
-variable "phase" {
+variable "environment" {
   default = "test"
 }

terraform/aws/vm/main.tf

@@ -5,8 +5,8 @@ resource "aws_instance" "vm" {
   instance_type = "t2.micro"
 
   tags {
-    App   = "${var.name}"
-    Phase = "${var.phase}"
-    Name  = "${var.phase}-${var.name}"
+    App         = "${var.name}"
+    environment = "${var.environment}"
+    Name        = "${var.environment}-${var.name}"
   }
 }

terraform/aws/vm/production.tfvars

@@ -1 +1 @@
-phase = "production"
+environment = "production"

terraform/aws/vm/staging.tfvars

@@ -1 +1 @@
-phase = "staging"
+environment = "staging"

terraform/aws/vm/variables.tf

@@ -2,6 +2,6 @@ variable "name" {
   default = "demo"
 }
 
-variable "phase" {
+variable "environment" {
   default = "test"
 }

terraform/gcp/bucket/01/main.tf

@@ -4,7 +4,7 @@ resource "google_storage_bucket" "bucket" {
   name = "test-<YOUR_NAME>-cloudnativedevops-demo-bucket"
 
   labels {
-    app   = "demo"
-    phase = "test"
+    app         = "demo"
+    environment = "test"
   }
 }

terraform/gcp/bucket/02/main.tf

@@ -1,10 +1,10 @@
 provider "google" {}
 
 resource "google_storage_bucket" "bucket" {
-  name = "${var.phase}-${var.your_name}-cloudnativedevops-${var.name}-bucket"
+  name = "${var.environment}-${var.your_name}-cloudnativedevops-${var.name}-bucket"
 
   labels {
-    app   = "${var.name}"
-    phase = "${var.phase}"
+    app         = "${var.name}"
+    environment = "${var.environment}"
   }
 }

terraform/gcp/bucket/02/variables.tf

@@ -2,7 +2,7 @@ variable "name" {
   default = "demo"
 }
 
-variable "phase" {
+variable "environment" {
   default = "test"
 }
 

terraform/gcp/bucket/03/production.tfvars

@@ -1 +1 @@
-phase = "production"
+environment = "production"

terraform/gcp/bucket/03/staging.tfvars

@@ -1 +1 @@
-phase = "staging"
+environment = "staging"

terraform/gcp/bucket/03/variables.tf

@@ -2,7 +2,7 @@ variable "name" {
   default = "demo"
 }
 
-variable "phase" {
+variable "environment" {
   default = "test"
 }
 

terraform/gcp/database/variables.tf

@@ -2,6 +2,6 @@ variable "name" {
   default = "demo"
 }
 
-variable "phase" {
+variable "environment" {
   default = "test"
 }

terraform/gcp/k8scluster/main.tf

@@ -1,7 +1,7 @@
 provider "google" {}
 
 resource "google_container_cluster" "k8s-cluster" {
-  name               = "${var.phase}-cloudnativedevops-${var.name}-k8s-cluster"
+  name               = "${var.environment}-cloudnativedevops-${var.name}-k8s-cluster"
   initial_node_count = "${var.initial_node_count}"
   zone               = "${var.zone}"
 }

terraform/gcp/k8scluster/production.tfvars

@@ -1,3 +1,3 @@
-phase = "production"
+environment = "production"
 
 initial_node_count = 4

terraform/gcp/k8scluster/staging.tfvars

@@ -1,3 +1,3 @@
-phase = "staging"
+environment = "staging"
 
 initial_node_count = 3

terraform/gcp/k8scluster/variables.tf

@@ -2,7 +2,7 @@ variable "name" {
   default = "demo"
 }
 
-variable "phase" {
+variable "environment" {
   default = "test"
 }