diff --git a/deploy/basic/README.md b/deploy/basic/README.md index 6a3e64fd3..5a421790f 100644 --- a/deploy/basic/README.md +++ b/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 /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: diff --git a/deploy/basic/terraform/.terraform.lock.hcl b/deploy/basic/terraform/.terraform.lock.hcl index e02802f52..623dbaa16 100644 --- a/deploy/basic/terraform/.terraform.lock.hcl +++ b/deploy/basic/terraform/.terraform.lock.hcl @@ -1,6 +1,28 @@ # This file is maintained automatically by "terraform init". # Manual edits may be lost in future updates. +provider "registry.terraform.io/hashicorp/cloudinit" { + version = "2.2.0" + hashes = [ + "h1:CUOSIT4XzkJXEpPp4dBL+rxxLgqamwiMvuhBVNHC7AI=", + "h1:Id6dDkpuSSLbGPTdbw49bVS/7XXHu/+d7CJoGDqtk5g=", + "h1:jjiYQ9lHpy5Ca9GoWbsXtuDr2HLgDQY8my1gIrp1lSo=", + "h1:siiI0wK6/jUDdA5P8ifTO0yc9YmXHml4hz5K9I9N+MA=", + "h1:tQLNREqesrdCQ/bIJnl0+yUK+XfdWzAG0wo4lp10LvM=", + "zh:76825122171f9ea2287fd27e23e80a7eb482f6491a4f41a096d77b666896ee96", + "zh:795a36dee548e30ca9c9d474af9ad6d29290e0a9816154ad38d55381cd0ab12d", + "zh:9200f02cb917fb99e44b40a68936fd60d338e4d30a718b7e2e48024a795a61b9", + "zh:a33cf255dc670c20678063aa84218e2c1b7a67d557f480d8ec0f68bc428ed472", + "zh:ba3c1b2cd0879286c1f531862c027ec04783ece81de67c9a3b97076f1ce7f58f", + "zh:bd575456394428a1a02191d2e46af0c00e41fd4f28cfe117d57b6aeb5154a0fb", + "zh:c68dd1db83d8437c36c92dc3fc11d71ced9def3483dd28c45f8640cfcd59de9a", + "zh:cbfe34a90852ed03cc074601527bb580a648127255c08589bc3ef4bf4f2e7e0c", + "zh:d6ffd7398c6d1f359b96f5b757e77b99b339fbb91df1b96ac974fe71bc87695c", + "zh:d9c15285f847d7a52df59e044184fb3ba1b7679fd0386291ed183782683d9517", + "zh:f7dd02f6d36844da23c9a27bb084503812c29c1aec4aba97237fec16860fdc8c", + ] +} + provider "registry.terraform.io/hashicorp/local" { version = "2.1.0" constraints = "2.1.0" @@ -9,6 +31,7 @@ provider "registry.terraform.io/hashicorp/local" { "h1:EYZdckuGU3n6APs97nS2LxZm3dDtGqyM4qaIvsmac8o=", "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=", "h1:KtUCltnScfZbcvpE9wPH+a0e7KgMX4w7y8RSxu5J/NQ=", + "h1:PaQTpxHMbZB9XV+c1od1eaUvndQle3ZZHx79hrI6C3k=", "zh:0f1ec65101fa35050978d483d6e8916664b7556800348456ff3d09454ac1eae2", "zh:36e42ac19f5d68467aacf07e6adcf83c7486f2e5b5f4339e9671f68525fc87ab", "zh:6db9db2a1819e77b1642ec3b5e95042b202aee8151a0256d289f2e141bf3ceb3", @@ -24,23 +47,25 @@ provider "registry.terraform.io/hashicorp/local" { } provider "registry.terraform.io/hashicorp/oci" { - version = "4.62.0" + version = "4.65.0" constraints = ">= 4.62.0" hashes = [ - "h1:XIydDH5Gc3VfNmBY7n2YonOgCz1CRF8zD4hTB6OXVy4=", - "h1:ZEsQhnYG92S+sBx+bLesK+sHh3AAdGGnGDOHreNVpu0=", - "h1:cFvK7+yK4Q+pORKz3z7r2a8q9inIqpyKk5sKawSRN7w=", - "h1:zTvs9aiJud9JDrw36i0E0xejri/qYQ/wAFBJ549GG8E=", - "zh:0f090e41c27aa29262f095d959b5a6e749ef283bb715ca59b5af1949dd5b401b", - "zh:2219a842e9a0fff45e935eb61a03f36187245a23c80536c536e392009f0b39b1", - "zh:2f8a557e55d6c4a98c5921aae14fe6fd881d6500806cbf759648fdc294412030", - "zh:840c6e198dddba03870cb25542efa1e8ffb4439e597160d6c985a1332974d109", - "zh:881571807a52d8af8c6cc7cef4e7e86d365902c0a09a63b7e7faef39ba7a023a", - "zh:bd81aa4fa2b6aa0594b021726b9953b8ceb1b34dc411c982b042ca277c73c943", - "zh:e7a9ad7528e69db03fc58f0cb64d76a117de926f46b2b9e3293cbec53f3721c1", - "zh:f2e090caa384c7ca8cf6f1c3f94ee0d05f25af8f41602ac4f68d9c54752e2973", - "zh:fc360d5f847ed2717bf7fa1c079f2adf68dc8091135174b9d8b1a2321eed9872", - "zh:fd4f7d07d044e17024616b3b8216fb992d313dcd106089b4930f0354768c43cd", + "h1:4R6GKyW79Jf/aaoyPE/MUsFbRz00l9pYLgVNqdoJPK4=", + "h1:8Z8sUsls0Rf7e6vPJnqgKgxgPXcfs/XNxtBe8Yhdcrg=", + "h1:ZhTjnP2vyxz1bwig45YS46g9LpOIJKUAy+4SkqrRW5A=", + "h1:kYQvcmK65U1KzhY2DAZvKPqJoLcxE+mU7e6oYxDzYj8=", + "h1:u91ohqk/pahoLdQ3gC+JXRMHFRgXQVIEnlDI4jzTiS0=", + "zh:0e3afc3787f5b818f35d6c4267c80000a111a8a0d08926c3f2ae1d3f4c2d16af", + "zh:1243b6bf14e86eb513baeabece654fd81723ae7fe95ad73fa7c6a16e7d27afaf", + "zh:784af9fb081dbcc10e19d4bbb4c0557fb8ee9330582b42ed64bbe083e0add3a0", + "zh:789752d30528e8926cccf197140ce8bf6993b12a0394bd6d545f354ac89ccaad", + "zh:7c8acc2d26fc0b8961c822dd909da68818ed9c4f99b87518d90eb737ad5300b6", + "zh:9f5eb00a3bf910af1127a221807f32d6de7eac0bcbc4fdbe1871b570a527cc1b", + "zh:a84fe99efe27e86cd7402f932bd74cea51e226416cfa50bdbdf0eae4d957d2cb", + "zh:b9d28470b8d35faf2932913a48b374356ab39871bf50d6767921e346f421c4a7", + "zh:cd3abe20894f807397e9dc613f7d549952f0f9bc6bc2e4dc3c9ff03ecfd626ac", + "zh:dd4b1a62bfa50bb2d3c378bdef3e82ecfed393f72c0ffa8ecb02b5cc663a599b", + "zh:fa3870391ca08a09af4508f9d44e5d42837852e9d8a18f084bdc1743ef20571c", ] } @@ -48,6 +73,7 @@ provider "registry.terraform.io/hashicorp/random" { version = "3.1.0" constraints = "3.1.0" hashes = [ + "h1:9cCiLO/Cqr6IUvMDSApCkQItooiYNatZpEXmcu0nnng=", "h1:BZMEPucF+pbu9gsPk0G0BHx7YP04+tKdq2MrRDF1EDM=", "h1:EPIax4Ftp2SNdB9pUfoSjxoueDoLc/Ck3EUoeX0Dvsg=", "h1:cH1JxJhQqK+FqqkJkmpX9QPC1OD08Bak1fm5IZcnMYw=", @@ -66,30 +92,11 @@ provider "registry.terraform.io/hashicorp/random" { ] } -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:0wlehNaxBX7GJQnPfQwTNvvAf38Jm0Nv7ssKGMaG6Og=", - "h1:12Bac8B6Aq2+18xe8iqp5iYytav2Bw+jG43z/VaK5zI=", - "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", - "h1:LN84cu+BZpVRvYlCzrbPfCRDaIelSyEx/W9Iwwgbnn4=", - "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", - "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", - "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", - "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16", - "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776", - "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451", - "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae", - "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde", - "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d", - "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2", - ] -} - provider "registry.terraform.io/hashicorp/tls" { version = "3.1.0" constraints = "3.1.0" hashes = [ + "h1:U+kgPLboCrcs4eZV87esP7iydF8mjMyHKE/mDsrwfkQ=", "h1:WsWbr4kSJVO5mpS20rFnJhHU0LUGRQ3z+lobUhg6sxc=", "h1:XTU9f6sGMZHOT8r/+LWCz2BZOPH127FBTPjMMEAAu1U=", "h1:ekOxs6MjdIElt8h9crEVaOwWbEqtfUUfArtA13Jkk6A=", diff --git a/deploy/basic/terraform/VERSION b/deploy/basic/terraform/VERSION index 50aea0e7a..7c3272873 100644 --- a/deploy/basic/terraform/VERSION +++ b/deploy/basic/terraform/VERSION @@ -1 +1 @@ -2.1.0 \ No newline at end of file +2.1.1 \ No newline at end of file diff --git a/deploy/basic/terraform/compute.tf b/deploy/basic/terraform/compute.tf index cfc9c6498..d7bc422af 100755 --- a/deploy/basic/terraform/compute.tf +++ b/deploy/basic/terraform/compute.tf @@ -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 diff --git a/deploy/basic/terraform/datasources.tf b/deploy/basic/terraform/datasources.tf index 47652cf58..8f4bd6482 100755 --- a/deploy/basic/terraform/datasources.tf +++ b/deploy/basic/terraform/datasources.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 diff --git a/deploy/basic/terraform/providers.tf b/deploy/basic/terraform/providers.tf index 2678ddf5b..f19743c82 100755 --- a/deploy/basic/terraform/providers.tf +++ b/deploy/basic/terraform/providers.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 } } diff --git a/deploy/basic/terraform/schema.yaml b/deploy/basic/terraform/schema.yaml index f6f17d924..aca72b210 100644 --- a/deploy/basic/terraform/schema.yaml +++ b/deploy/basic/terraform/schema.yaml @@ -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} \ No newline at end of file +primaryOutputButton: ${lb_public_url_button} \ No newline at end of file diff --git a/deploy/basic/terraform/variables.tf b/deploy/basic/terraform/variables.tf index cfeabd996..fd7aeb7e6 100755 --- a/deploy/basic/terraform/variables.tf +++ b/deploy/basic/terraform/variables.tf @@ -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" 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 index e104110af..31208ab46 100644 --- a/deploy/complete/helm-chart/mushop/charts/carts/templates/carts-deployment.yaml +++ b/deploy/complete/helm-chart/mushop/charts/carts/templates/carts-deployment.yaml @@ -49,4 +49,4 @@ spec: medium: Memory {{- include "carts.volumes" . | nindent 8 }} nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux 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 index f78b7c22a..bdaa296cb 100644 --- a/deploy/complete/helm-chart/mushop/charts/orders/templates/orders-deployment.yaml +++ b/deploy/complete/helm-chart/mushop/charts/orders/templates/orders-deployment.yaml @@ -71,4 +71,4 @@ spec: medium: Memory {{- include "orders.volumes" . | nindent 8 }} nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux 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 index a5116bd3b..df2a56004 100644 --- a/deploy/complete/helm-chart/mushop/charts/payment/templates/payment-deployment.yaml +++ b/deploy/complete/helm-chart/mushop/charts/payment/templates/payment-deployment.yaml @@ -45,4 +45,4 @@ spec: securityContext: {{- toYaml .Values.securityContext | nindent 12 }} nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/complete/helm-chart/mushop/charts/session/templates/session-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/session/templates/session-deployment.yaml index 0712d0f0c..bbdc016a2 100644 --- a/deploy/complete/helm-chart/mushop/charts/session/templates/session-deployment.yaml +++ b/deploy/complete/helm-chart/mushop/charts/session/templates/session-deployment.yaml @@ -31,4 +31,4 @@ spec: securityContext: {{- toYaml .Values.securityContext | nindent 12 }} nodeSelector: - beta.kubernetes.io/os: linux \ No newline at end of file + kubernetes.io/os: linux \ No newline at end of file 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 index a6d338f76..ff811c0eb 100644 --- a/deploy/complete/helm-chart/mushop/charts/user/templates/user-deployment.yaml +++ b/deploy/complete/helm-chart/mushop/charts/user/templates/user-deployment.yaml @@ -48,4 +48,4 @@ spec: periodSeconds: 5 volumes: {{- include "user.volumes" . | nindent 8 }} nodeSelector: - beta.kubernetes.io/os: linux \ No newline at end of file + kubernetes.io/os: linux \ No newline at end of file diff --git a/deploy/complete/helm-chart/setup/requirements.yaml b/deploy/complete/helm-chart/setup/requirements.yaml index 39de7a144..e7cf41808 100644 --- a/deploy/complete/helm-chart/setup/requirements.yaml +++ b/deploy/complete/helm-chart/setup/requirements.yaml @@ -5,17 +5,17 @@ dependencies: # Prometheus - name: prometheus - version: 15.1.3 + version: 15.4.0 condition: prometheus.enabled repository: https://prometheus-community.github.io/helm-charts # Grafana - name: grafana - version: 6.21.2 + version: 6.22.0 condition: grafana.enabled repository: https://grafana.github.io/helm-charts # HPA Metrics - name: metrics-server - version: 3.8.0 + version: 3.8.2 condition: metrics-server.enabled repository: https://kubernetes-sigs.github.io/metrics-server # Ingress Controller diff --git a/deploy/complete/helm-chart/setup/values.yaml b/deploy/complete/helm-chart/setup/values.yaml index b1dd8c428..6258d2f69 100644 --- a/deploy/complete/helm-chart/setup/values.yaml +++ b/deploy/complete/helm-chart/setup/values.yaml @@ -19,7 +19,8 @@ prometheus: static_configs: - targets: - {{ .Release.Name }}-ingress-nginx-controller-metrics:9913 - + nodeExporter: + hostRootfs: false # https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog/README.md catalog: diff --git a/deploy/complete/kubernetes/README.md b/deploy/complete/kubernetes/README.md index 1d95ae218..800cc6a18 100644 --- a/deploy/complete/kubernetes/README.md +++ b/deploy/complete/kubernetes/README.md @@ -1,9 +1,15 @@ # Deploy in Kubernetes +> Note: The preferable deployment option is using Helm Charts or Resource Manager Stack. The Kubernetes manifests do not perform some of the actions needed (need manual interaction), and is not updated often like the Helm Charts. Is left here for reference and to review the manifests generated by the helm charts. + ## Deploy using Helm Chart Refer to [helm-chart](../helm-chart/README.md) +--- + +> If you decide to deploy using the plain kubernetes manifests (Generated from the Helm Charts), follow the instructions bellow: + ## Prerequisites ### Install Ingress Controller diff --git a/deploy/complete/terraform/.terraform.lock.hcl b/deploy/complete/terraform/.terraform.lock.hcl index 616b87577..f4df986ff 100644 --- a/deploy/complete/terraform/.terraform.lock.hcl +++ b/deploy/complete/terraform/.terraform.lock.hcl @@ -7,6 +7,7 @@ provider "registry.terraform.io/hashicorp/helm" { hashes = [ "h1:+2eoyrCiL/1j4J6064i+aeac0RrBzy8d6uB5MZ25zSk=", "h1:/Hdj7kToHecF0frqu7Xco0Dp/fhqjcidyI/tthY2tJc=", + "h1:Bay+WVSBY2bMiFzARPCKznhfPco2S/WwgyChqwWodTc=", "h1:O/1uro4uBqhAHkTA0n0PqWwHO5OIXpqtQRoAMiXdewY=", "h1:mrkVquJ5aHCv6spC+AeolSL74BfFnyGPc8llQ590h98=", "zh:060e0b2b921ed4d4f3b2547236b083a718318634fc19dbdac1a6a2fd77195c6e", @@ -28,6 +29,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { constraints = "2.2.0" hashes = [ "h1:+5kneLe8twuafpJxCO8Hw4UA9dkHaY8Jg5U4+RRWxq8=", + "h1:BtekG/QVmKGGa7mCUnYBjyOvB0QqGYNPCMRDi2k62wc=", "h1:MP2ApCv4RbHWreeKQ+0xZZHALJ94AZIkfjiPsLRN41I=", "h1:Sb7AlwtZ6VYoS/A+Ls64UFJiyTBNReZZFHI9kKAN6gM=", "h1:iGRiQAggGI+k1uhlLhqbYQtAg3GYYO+0UP1aRjYvdaI=", @@ -53,6 +55,7 @@ provider "registry.terraform.io/hashicorp/local" { "h1:EYZdckuGU3n6APs97nS2LxZm3dDtGqyM4qaIvsmac8o=", "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=", "h1:KtUCltnScfZbcvpE9wPH+a0e7KgMX4w7y8RSxu5J/NQ=", + "h1:PaQTpxHMbZB9XV+c1od1eaUvndQle3ZZHx79hrI6C3k=", "zh:0f1ec65101fa35050978d483d6e8916664b7556800348456ff3d09454ac1eae2", "zh:36e42ac19f5d68467aacf07e6adcf83c7486f2e5b5f4339e9671f68525fc87ab", "zh:6db9db2a1819e77b1642ec3b5e95042b202aee8151a0256d289f2e141bf3ceb3", @@ -68,23 +71,25 @@ provider "registry.terraform.io/hashicorp/local" { } provider "registry.terraform.io/hashicorp/oci" { - version = "4.62.0" - constraints = ">= 4.62.0" + version = "4.65.0" + constraints = ">= 4.65.0" hashes = [ - "h1:XIydDH5Gc3VfNmBY7n2YonOgCz1CRF8zD4hTB6OXVy4=", - "h1:ZEsQhnYG92S+sBx+bLesK+sHh3AAdGGnGDOHreNVpu0=", - "h1:cFvK7+yK4Q+pORKz3z7r2a8q9inIqpyKk5sKawSRN7w=", - "h1:zTvs9aiJud9JDrw36i0E0xejri/qYQ/wAFBJ549GG8E=", - "zh:0f090e41c27aa29262f095d959b5a6e749ef283bb715ca59b5af1949dd5b401b", - "zh:2219a842e9a0fff45e935eb61a03f36187245a23c80536c536e392009f0b39b1", - "zh:2f8a557e55d6c4a98c5921aae14fe6fd881d6500806cbf759648fdc294412030", - "zh:840c6e198dddba03870cb25542efa1e8ffb4439e597160d6c985a1332974d109", - "zh:881571807a52d8af8c6cc7cef4e7e86d365902c0a09a63b7e7faef39ba7a023a", - "zh:bd81aa4fa2b6aa0594b021726b9953b8ceb1b34dc411c982b042ca277c73c943", - "zh:e7a9ad7528e69db03fc58f0cb64d76a117de926f46b2b9e3293cbec53f3721c1", - "zh:f2e090caa384c7ca8cf6f1c3f94ee0d05f25af8f41602ac4f68d9c54752e2973", - "zh:fc360d5f847ed2717bf7fa1c079f2adf68dc8091135174b9d8b1a2321eed9872", - "zh:fd4f7d07d044e17024616b3b8216fb992d313dcd106089b4930f0354768c43cd", + "h1:4R6GKyW79Jf/aaoyPE/MUsFbRz00l9pYLgVNqdoJPK4=", + "h1:8Z8sUsls0Rf7e6vPJnqgKgxgPXcfs/XNxtBe8Yhdcrg=", + "h1:ZhTjnP2vyxz1bwig45YS46g9LpOIJKUAy+4SkqrRW5A=", + "h1:kYQvcmK65U1KzhY2DAZvKPqJoLcxE+mU7e6oYxDzYj8=", + "h1:u91ohqk/pahoLdQ3gC+JXRMHFRgXQVIEnlDI4jzTiS0=", + "zh:0e3afc3787f5b818f35d6c4267c80000a111a8a0d08926c3f2ae1d3f4c2d16af", + "zh:1243b6bf14e86eb513baeabece654fd81723ae7fe95ad73fa7c6a16e7d27afaf", + "zh:784af9fb081dbcc10e19d4bbb4c0557fb8ee9330582b42ed64bbe083e0add3a0", + "zh:789752d30528e8926cccf197140ce8bf6993b12a0394bd6d545f354ac89ccaad", + "zh:7c8acc2d26fc0b8961c822dd909da68818ed9c4f99b87518d90eb737ad5300b6", + "zh:9f5eb00a3bf910af1127a221807f32d6de7eac0bcbc4fdbe1871b570a527cc1b", + "zh:a84fe99efe27e86cd7402f932bd74cea51e226416cfa50bdbdf0eae4d957d2cb", + "zh:b9d28470b8d35faf2932913a48b374356ab39871bf50d6767921e346f421c4a7", + "zh:cd3abe20894f807397e9dc613f7d549952f0f9bc6bc2e4dc3c9ff03ecfd626ac", + "zh:dd4b1a62bfa50bb2d3c378bdef3e82ecfed393f72c0ffa8ecb02b5cc663a599b", + "zh:fa3870391ca08a09af4508f9d44e5d42837852e9d8a18f084bdc1743ef20571c", ] } @@ -92,6 +97,7 @@ provider "registry.terraform.io/hashicorp/random" { version = "3.1.0" constraints = "3.1.0" hashes = [ + "h1:9cCiLO/Cqr6IUvMDSApCkQItooiYNatZpEXmcu0nnng=", "h1:BZMEPucF+pbu9gsPk0G0BHx7YP04+tKdq2MrRDF1EDM=", "h1:EPIax4Ftp2SNdB9pUfoSjxoueDoLc/Ck3EUoeX0Dvsg=", "h1:cH1JxJhQqK+FqqkJkmpX9QPC1OD08Bak1fm5IZcnMYw=", @@ -114,6 +120,7 @@ provider "registry.terraform.io/hashicorp/tls" { version = "3.1.0" constraints = "3.1.0" hashes = [ + "h1:U+kgPLboCrcs4eZV87esP7iydF8mjMyHKE/mDsrwfkQ=", "h1:WsWbr4kSJVO5mpS20rFnJhHU0LUGRQ3z+lobUhg6sxc=", "h1:XTU9f6sGMZHOT8r/+LWCz2BZOPH127FBTPjMMEAAu1U=", "h1:ekOxs6MjdIElt8h9crEVaOwWbEqtfUUfArtA13Jkk6A=", diff --git a/deploy/complete/terraform/VERSION b/deploy/complete/terraform/VERSION index a0cd9f0cc..50e47c89c 100644 --- a/deploy/complete/terraform/VERSION +++ b/deploy/complete/terraform/VERSION @@ -1 +1 @@ -3.1.0 \ No newline at end of file +3.1.1 \ No newline at end of file diff --git a/deploy/complete/terraform/chart-values/prometheus-values.yaml b/deploy/complete/terraform/chart-values/prometheus-values.yaml index d78485364..a4fab51c6 100644 --- a/deploy/complete/terraform/chart-values/prometheus-values.yaml +++ b/deploy/complete/terraform/chart-values/prometheus-values.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2020, 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. # @@ -8,4 +8,6 @@ extraScrapeConfigs: | scrape_interval: 5s static_configs: - targets: - - mushop-utils-ingress-nginx-controller-metrics:9913 \ No newline at end of file + - mushop-utils-ingress-nginx-controller-metrics:9913 +nodeExporter: + hostRootfs: false diff --git a/deploy/complete/terraform/mushop-utilities.tf b/deploy/complete/terraform/mushop-utilities.tf index 6c218e020..e2248ab6b 100644 --- a/deploy/complete/terraform/mushop-utilities.tf +++ b/deploy/complete/terraform/mushop-utilities.tf @@ -18,7 +18,7 @@ resource "helm_release" "prometheus" { name = "prometheus" repository = local.helm_repository.prometheus chart = "prometheus" - version = "15.1.3" + version = "15.4.0" namespace = kubernetes_namespace.cluster_utilities_namespace.id wait = false @@ -37,7 +37,7 @@ resource "helm_release" "grafana" { name = "mushop-utils-grafana" # mushop-utils included to be backwards compatible to the docs and setup chart install repository = local.helm_repository.grafana chart = "grafana" - version = "6.21.2" + version = "6.22.0" namespace = kubernetes_namespace.cluster_utilities_namespace.id wait = false @@ -97,7 +97,7 @@ resource "helm_release" "metrics_server" { name = "metrics-server" repository = local.helm_repository.metrics_server chart = "metrics-server" - version = "3.8.0" + version = "3.8.2" namespace = kubernetes_namespace.cluster_utilities_namespace.id wait = false diff --git a/deploy/complete/terraform/mushop-variables.tf b/deploy/complete/terraform/mushop-variables.tf index cf702d5b8..19cb80ee8 100644 --- a/deploy/complete/terraform/mushop-variables.tf +++ b/deploy/complete/terraform/mushop-variables.tf @@ -47,7 +47,7 @@ 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 "create_oci_service_user" { - default = true + default = false description = "Creates OCI Service User. Service user is needed for Email Delivery (Newsletter feature) and Stream services." } variable "newsletter_subscription_enabled" { diff --git a/deploy/complete/terraform/oke-variables.tf b/deploy/complete/terraform/oke-variables.tf index e931bbd6d..d372acf62 100644 --- a/deploy/complete/terraform/oke-variables.tf +++ b/deploy/complete/terraform/oke-variables.tf @@ -183,7 +183,7 @@ variable "create_compartment_policies" { description = "Creates policies that will reside on the compartment. e.g.: Policies to support Cluster Autoscaler, OCI Logging datasource on Grafana" } variable "create_tenancy_policies" { - default = true + default = false description = "Creates policies that need to reside on the tenancy. e.g.: Policies to support OCI Metrics datasource on Grafana" } diff --git a/deploy/complete/terraform/providers.tf b/deploy/complete/terraform/providers.tf index f1832454c..5a70920d3 100644 --- a/deploy/complete/terraform/providers.tf +++ b/deploy/complete/terraform/providers.tf @@ -7,8 +7,8 @@ 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 } kubernetes = { source = "hashicorp/kubernetes" diff --git a/deploy/complete/terraform/schema.yaml b/deploy/complete/terraform/schema.yaml index 650824e94..fdbd31628 100644 --- a/deploy/complete/terraform/schema.yaml +++ b/deploy/complete/terraform/schema.yaml @@ -636,7 +636,7 @@ variables: oda_uri: type: string title: "Oracle Digital Assistant URI" - required: false + required: true visible: and: - show_advanced @@ -645,7 +645,7 @@ variables: oda_channel_id: type: string title: "Oracle Digital Assistant channel ID" - required: false + required: true visible: and: - show_advanced @@ -758,6 +758,7 @@ outputGroups: - external_ip - domain_name - mushop_url_https + - mushop_url_alternative - title: Passwords and Keys outputs: @@ -815,6 +816,11 @@ outputs: displayText: Full Qualified Domain Name visible: true + mushop_url_alternative: + type: link + title: "Alternative Hostname" + visible: true + autonomous_database_password: type: string title: DB Admin Password