Merge pull request #313 from junior/quick_fixes

Quick fixes

Author: junior

deploy/basic/README.md

@@ -83,40 +83,15 @@ This creates a `.zip` file in your working directory that can be imported in to
         docker buildx build --pull --rm --load -t mushop-basic -f deploy/basic/Dockerfile .
         ```
 
-    Note: Building Multi-Arch and loading locally (using --load) currently is not supported by Docker. You need to build one platform at time.
-
-    * linux/amd64
-
-        ```shell
-        docker buildx build --pull --rm --platform linux/amd64 --load -t mushop-basic -f deploy/basic/Dockerfile .
-        ```
-
-    * linux/arm64
-
-        ```shell
-        docker buildx build --pull --rm --platform linux/arm64 --load -t mushop-basic-arm64 -f deploy/basic/Dockerfile .
-        ```
-
-    * linux/amd64,linux/arm64 if pushing the mushop builder to local registry:
-
-        ```shell
-        docker buildx build --pull --rm --platform linux/amd64,linux/arm64 --push -t <registry>/mushop-basic -f deploy/basic/Dockerfile .
-        ```
-
 1. Run locally
-    * linux/amd64 (or default builder)
-
-        ```shell
-        docker run --rm -it mushop-basic:latest
-        ```
 
-    * linux/arm64
+    ```shell
+    docker run --rm -it -p 8888:80 mushop-basic:latest
+    ```
 
-        ```shell
-        docker run --rm -it mushop-basic-arm64:latest
-        ```
+1. Browse to http://localhost:8888
 
-## Deploying using local or CloudShell *Terraform* instead of ORM stack
+## Deploying using local or OCI CloudShell *Terraform* instead of ORM stack
 
 After complete the Build steps 1 and 2, generate the binaries:
 

deploy/basic/terraform/.terraform.lock.hcl

@@ -1 +1 @@
-2.1.0
+2.1.1

deploy/basic/terraform/VERSION

@@ -33,7 +33,7 @@ resource "oci_core_instance" "app_instance" {
 
   metadata = {
     ssh_authorized_keys = var.generate_public_ssh_key ? tls_private_key.compute_ssh_key.public_key_openssh : var.public_ssh_key
-    user_data           = data.template_cloudinit_config.nodes.rendered
+    user_data           = data.cloudinit_config.nodes.rendered
   }
 
   count = var.num_nodes

deploy/basic/terraform/compute.tf

@@ -122,7 +122,7 @@ data "oci_core_services" "all_services" {
 }
 
 # Cloud Init
-data "template_cloudinit_config" "nodes" {
+data "cloudinit_config" "nodes" {
   gzip          = true
   base64_encode = true
 

deploy/basic/terraform/datasources.tf

@@ -7,22 +7,27 @@ terraform {
   required_providers {
     oci = {
       source  = "hashicorp/oci"
-      version = ">= 4.62.0"
-      # https://registry.terraform.io/providers/hashicorp/oci/4.62.0
+      version = ">= 4.65.0"
+      # https://registry.terraform.io/providers/hashicorp/oci/4.65.0
     }
     local = {
       source  = "hashicorp/local"
-      version = "2.1.0" # Latest version as June 2021 = 2.1.0.
+      version = "2.1.0" # Latest version as February 2022 = 2.1.0.
       # https://registry.terraform.io/providers/hashicorp/local/2.1.0
     }
     random = {
       source  = "hashicorp/random"
-      version = "3.1.0" # Latest version as June 2021 = 3.1.0.
+      version = "3.1.0" # Latest version as February 2022 = 3.1.0.
       # https://registry.terraform.io/providers/hashicorp/random/3.1.0
     }
     tls = {
       source  = "hashicorp/tls"
-      version = "3.1.0" # Latest version as June 2021 = 3.1.0.
+      version = "3.1.0" # Latest version as February 2022 = 3.1.0.
+      # https://registry.terraform.io/providers/hashicorp/tls/3.1.0
+    }
+    cloudinit = {
+      source  = "hashicorp/cloudinit"
+      version = "2.2.0" # Latest version as February 2022 = 2.2.0.
       # https://registry.terraform.io/providers/hashicorp/tls/3.1.0
     }
   }

deploy/basic/terraform/providers.tf

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019-2022 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
@@ -20,10 +20,6 @@ groupings:
     - tenancy_ocid
     - region
 
-  - title: "General Configuration"
-    variables:
-    - num_nodes
-
   - title: "Optional Configuration"
     variables:
     - autonomous_database_name
@@ -43,6 +39,7 @@ groupings:
 
   - title: "Advanced Resource Options - Compute"
     variables:
+    - num_nodes
     - instance_shape
     - instance_ocpus
     - instance_shape_config_memory_in_gbs
@@ -115,6 +112,9 @@ variables:
     description: "Choose the number of compute instances to deploy."
     default: "2"
     required: true
+    visible:
+      and:
+        - show_advanced
 
   autonomous_database_name:
     type: string
@@ -521,6 +521,8 @@ outputGroups:
     outputs:
       - lb_public_url
       - lb_nip_host_url
+      - mushop_source_code
+      - mushop_version
 
   - title: Passwords and Keys
     outputs:
@@ -537,8 +539,6 @@ outputGroups:
     outputs:
       - dev
       - comments
-      - mushop_source_code
-      - mushop_version
 
 outputs:
   lb_public_url_button:
@@ -549,8 +549,7 @@ outputs:
 
   lb_public_url:
     type: link
-    title: MuShop
-    displayText: Storefront
+    title: MuShop URL
     visible: true
 
   lb_nip_host_url:
@@ -601,4 +600,4 @@ outputs:
     displayText: "The application URL will be unavailable for a few minutes after provisioning, while the application is configured"
     visible: true
 
-primaryOutputButton: ${lb_public_url}
+primaryOutputButton: ${lb_public_url_button}

deploy/basic/terraform/schema.yaml

@@ -28,13 +28,13 @@ variable "generate_public_ssh_key" {
   default = true
 }
 variable "instance_shape" {
-  default = "VM.Standard.E3.Flex"
+  default = "VM.Standard.A1.Flex"
 }
 variable "instance_ocpus" {
   default = 1
 }
 variable "instance_shape_config_memory_in_gbs" {
-  default = 16
+  default = 6
 }
 variable "image_operating_system" {
   default = "Oracle Linux"

deploy/basic/terraform/variables.tf

@@ -49,4 +49,4 @@ spec:
             medium: Memory
         {{- include "carts.volumes" . | nindent 8 }}
       nodeSelector:
-          beta.kubernetes.io/os: linux
+          kubernetes.io/os: linux

deploy/complete/helm-chart/mushop/charts/carts/templates/carts-deployment.yaml

@@ -71,4 +71,4 @@ spec:
             medium: Memory
         {{- include "orders.volumes" . | nindent 8 }}
       nodeSelector:
-          beta.kubernetes.io/os: linux
+          kubernetes.io/os: linux