Select image mode (#88)

pgressa · web-flow · commit f1949fb9654e · 2021-06-24T14:49:54.000+02:00
diff --git a/deploy/complete/helm-chart/mushop/charts/api/templates/api-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/api/templates/api-deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.global.imageSuffix | default .Values.image.suffix }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 8080
diff --git a/deploy/complete/helm-chart/mushop/charts/api/values.yaml b/deploy/complete/helm-chart/mushop/charts/api/values.yaml
@@ -1,7 +1,8 @@
 replicaCount: 1
 
 image:
-  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/api-native
+  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/api
+  suffix: native
   tag: 1.0.1-SNAPSHOT
   pullPolicy: Always
 
diff --git a/deploy/complete/helm-chart/mushop/charts/carts/templates/carts-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/carts/templates/carts-deployment.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.global.imageSuffix | default .Values.image.suffix }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 8080
diff --git a/deploy/complete/helm-chart/mushop/charts/carts/values.yaml b/deploy/complete/helm-chart/mushop/charts/carts/values.yaml
@@ -1,8 +1,9 @@
 replicaCount: 1
 
 image:
-  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/carts-native
-  tag: 1.0.3
+  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/carts
+  suffix: native
+  tag: 1.0.4-SNAPSHOT
   pullPolicy: Always
 
 dbtools:
diff --git a/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-deployment.yaml
@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.global.imageSuffix | default .Values.image.suffix }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 8080
diff --git a/deploy/complete/helm-chart/mushop/charts/catalogue/values.yaml b/deploy/complete/helm-chart/mushop/charts/catalogue/values.yaml
@@ -1,8 +1,9 @@
 replicaCount: 1
 
 image:
-  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/catalogue-native
-  tag: 1.0.0
+  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/catalogue
+  suffix: native
+  tag: 1.0.1-SNAPSHOT
   pullPolicy: Always
 
 dbtools:
diff --git a/deploy/complete/helm-chart/mushop/charts/events/templates/events-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/events/templates/events-deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.global.imageSuffix | default .Values.image.suffix }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: KAFKA_HEALTH_ENABLED
diff --git a/deploy/complete/helm-chart/mushop/charts/events/values.yaml b/deploy/complete/helm-chart/mushop/charts/events/values.yaml
@@ -1,8 +1,9 @@
 replicaCount: 1
 
 image:
-  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/events-native
-  tag: 1.0.0
+  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/events
+  suffix: native
+  tag: 1.0.1-SNAPSHOT
   pullPolicy: Always
 
 osb: {}
diff --git a/deploy/complete/helm-chart/mushop/charts/fulfillment/templates/fulfillment-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/fulfillment/templates/fulfillment-deployment.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.global.imageSuffix | default .Values.image.suffix }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/deploy/complete/helm-chart/mushop/charts/fulfillment/values.yaml b/deploy/complete/helm-chart/mushop/charts/fulfillment/values.yaml
@@ -1,8 +1,9 @@
 replicaCount: 1
 
 image:
-  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/fulfillment-native
-  tag: 1.0.0
+  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/fulfillment
+  suffix: native
+  tag: 1.0.1-SNAPSHOT
   pullPolicy: Always
 
 osb: {}
diff --git a/deploy/complete/helm-chart/mushop/charts/orders/templates/orders-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/orders/templates/orders-deployment.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.global.imageSuffix | default .Values.image.suffix }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 8082
diff --git a/deploy/complete/helm-chart/mushop/charts/orders/values.yaml b/deploy/complete/helm-chart/mushop/charts/orders/values.yaml
@@ -1,8 +1,9 @@
 replicaCount: 1
 
 image:
-  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/orders-graalvm
-  tag: 1.0.0
+  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/orders
+  suffix: native
+  tag: 1.0.1-SNAPSHOT
   pullPolicy: Always
 
 dbtools:
diff --git a/deploy/complete/helm-chart/mushop/charts/payment/templates/payment-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/payment/templates/payment-deployment.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.global.imageSuffix | default .Values.image.suffix }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 8080
@@ -44,7 +44,7 @@ spec:
             periodSeconds: 5
           env:
             - name: PAYMENT_DECLINE_AMOUNT
-              value: {{ .Values.decline.amount }}
+              value: {{ .Values.decline.amount | quote }}
           {{- include "payment.oapm.connection" . | nindent 12 }}
           {{- include "payment.oims.config" . | nindent 12 }}
       nodeSelector:
diff --git a/deploy/complete/helm-chart/mushop/charts/payment/values.yaml b/deploy/complete/helm-chart/mushop/charts/payment/values.yaml
@@ -1,8 +1,9 @@
 replicaCount: 1
 
 image:
-  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/payment-native
-  tag: 1.0.0
+  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/payment
+  suffix: native
+  tag: 1.0.1-SNAPSHOT
   pullPolicy: Always
 
 decline:
diff --git a/deploy/complete/helm-chart/mushop/charts/user/templates/user-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/user/templates/user-deployment.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.global.imageSuffix | default .Values.image.suffix }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/deploy/complete/helm-chart/mushop/charts/user/values.yaml b/deploy/complete/helm-chart/mushop/charts/user/values.yaml
@@ -1,8 +1,9 @@
 replicaCount: 1
 
 image:
-  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/user-native
-  tag: 1.0.0
+  repository: iad.ocir.io/cloudnative-devrel/micronaut-showcase/mushop/user
+  suffix: native
+  tag: 1.0.1-SNAPSHOT
   pullPolicy: Always
 
 dbtools:
diff --git a/deploy/complete/helm-chart/mushop/values.yaml b/deploy/complete/helm-chart/mushop/values.yaml
@@ -11,6 +11,7 @@ global:
   oapmConnectionSecret:
   ociDeploymentConfigMap:
   ossConnectionSecret:
+  imageSuffix:
 
 # Depending on the scenario, certain resources might need to be skipped.
 # For example, --set tags.streaming=false to disable required streaming manifests
diff --git a/deploy/complete/terraform/VERSION b/deploy/complete/terraform/VERSION
@@ -1 +1 @@
-3.0.0
+3.1.0
diff --git a/deploy/complete/terraform/mushop-variables.tf b/deploy/complete/terraform/mushop-variables.tf
@@ -14,6 +14,17 @@ variable "mushop_mock_mode_all" {
   description = "If enabled, will not provision ATP Database, Object Storage, or Streaming. The services will run in mock mode and will connect to an in-memory database, and the data will not persist"
 }
 
+variable "mushop_micronaut_service_version" {
+  default = "native"
+  type = string
+  description = "Every Micronaut MuShop service has one of three version: using GraalVM for java runtime, using openjdk for java runtime and GraalVM native image."
+
+  validation {
+    condition     = contains(["native", "graalvm", "openjdk"], var.mushop_micronaut_service_version)
+    error_message = "Allowed values for mushop_micronaut_service_version are \"native\", \"graalvm\", or \"openjdk\"."
+  }
+}
+
 ## Common Services (MuShop Utilities)
 variable "grafana_enabled" {
   default     = true
diff --git a/deploy/complete/terraform/mushop.tf b/deploy/complete/terraform/mushop.tf
@@ -49,10 +49,15 @@ resource "helm_release" "mushop" {
     name  = "global.test"
     value = var.oci_deployment
   }
+  set {
+    name  = "global.imageSuffix"
+    value = var.mushop_micronaut_service_version
+  }
   set {
     name  = "api.env.trackingEnabled"
     value = var.create_oracle_streaming_service_stream ? true : false
   }
+
   # set {
   #   name  = "global.oosBucketSecret" # Commented until come with solution to gracefull removal of objects when terraform destroy
   #   value = var.oos_bucket_name
diff --git a/deploy/complete/terraform/schema.yaml b/deploy/complete/terraform/schema.yaml
@@ -28,6 +28,10 @@ variableGroups:
     - show_advanced
     # - mushop_atp
     # - mushop_oss
+
+  - title: "Micronaut MuShop"
+    variables:
+    - mushop_micronaut_service_version
     
   - title: "OKE Cluster Configuration"
     variables:
@@ -164,6 +168,17 @@ variables:
       and:
         - create_new_oke_cluster
 
+  mushop_micronaut_service_version:
+    type: enum
+    enum:
+      - "native"
+      - "graalvm"
+      - "openjdk"
+    title: "Micronaut MuShop service version"
+    default: "native"
+    description: "Every Micronaut MuShop service has one of three version: using GraalVM for java runtime, using openjdk for java runtime and GraalVM native image."
+    required: true
+
   show_advanced:
     type: boolean
     title: "Show advanced options?"
