Merge pull request #122 from paliarush/fixed-kubernetes-version

Elasticsearch and Heapster fixes

Author: paliarush

etc/helm/requirements.lock

@@ -10,6 +10,6 @@ dependencies:
   version: 5.5.0
 - name: elasticsearch
   repository: https://helm.elastic.co
-  version: 6.5.0
+  version: 6.8.8
 digest: sha256:d8cb388574e1db38759d9b1113cc4fc95ff550aeb024c5a449d711c2636cc66d
 generated: 2019-08-19T10:57:16.077076-05:00

etc/helm/requirements.yaml

@@ -13,5 +13,5 @@ dependencies:
   version: "5.5.0"
 - name: elasticsearch
   repository: "https://helm.elastic.co"
-  appVersion: "6.7.1"
+  appVersion: "6.5.0"
   version: "6.5.0"

etc/helm/values.yaml

@@ -90,12 +90,6 @@ rabbitmq:
     password: 123123q
 
 elasticsearch:
-  imageTag: "6.7.1"
-  esMajorVersion: 6
-
-  replicas: 1
-  minimumMasterNodes: 1
-
   # Permit co-located instances for solitary minikube virtual machines.
   antiAffinity: "soft"
 

init_project.sh

@@ -94,16 +94,6 @@ if [[ ! $(isMinikubeRunning) -eq 1 ]]; then
     minikube start --kubernetes-version=v1.15.6 -v=0 --cpus=2 --memory=4096
     minikube config set kubernetes-version v1.15.6
     minikube addons enable ingress
-    minikube addons enable heapster
-    # TODO: Remove if not needed
-#    minikube start --kubernetes-version=v1.15.6 -v=0 --cache-images --cpus=2 --memory=4096 2> >(logError) | {
-#      while IFS= read -r line
-#      do
-#        filterDevboxOutput "${line}"
-#        lastline="${line}"
-#      done
-#      filterDevboxOutput "${lastline}"
-#    }
 fi
 
 config_content="$(cat ${config_path})"

scripts/functions.sh

@@ -92,6 +92,7 @@ function outputErrorsOnly()
 {
     errors="$(echo "${1}" | grep -iv "Connection to 127.0.0.1 closed." \
         | grep -iv "Cloning into .*\.\.\."\
+        | grep -iv "Overwrite the existing configuration for session-save .*"\
         | grep -iv "Checking out .* done\."\
     )"
     if [[ -n "${errors}" ]]; then
@@ -104,6 +105,7 @@ function outputInfoOnly()
 {
     info="$(echo "${1}" | grep -iv "Connection to 127.0.0.1 closed." \
         | grep -i "Cloning into .*\.\.\."\
+        | grep -i "Overwrite the existing configuration for session-save .*"\
         | grep -i "Checking out .* done\."\
     )"
     if [[ -n "${info}" ]]; then
@@ -149,6 +151,7 @@ function initLogFile()
         log_file="debug"
     fi
     echo "log/${log_file}.log" > "${log_file_path}"
+    chmod a+w "${log_file_path}"
     rm -f "${devbox_dir}/log/${log_file}.log"
     touch "${devbox_dir}/log/${log_file}.log"
     chmod a+w "${devbox_dir}/log/${log_file}.log"

scripts/guest/m-reinstall

@@ -105,9 +105,9 @@ php ${install_cmd} 2> >(logError) > >(log)
 # php -d xdebug.remote_autostart=1 ${install_cmd} 2> >(logError) > >(log)
 
 status "Configuring Redis for session and as cache backend"
-php "${DEVBOX_ROOT}/$(getContext)/bin/magento" setup:config:set --page-cache=redis --page-cache-redis-server=magento2-redis-master
-php "${DEVBOX_ROOT}/$(getContext)/bin/magento" setup:config:set --cache-backend=redis --cache-backend-redis-server=magento2-redis-master
-php "${DEVBOX_ROOT}/$(getContext)/bin/magento" setup:config:set --session-save=redis --session-save-redis-host=magento2-redis-master
+yes | php "${DEVBOX_ROOT}/$(getContext)/bin/magento" setup:config:set --page-cache=redis --page-cache-redis-server=magento2-redis-master
+yes | php "${DEVBOX_ROOT}/$(getContext)/bin/magento" setup:config:set --cache-backend=redis --cache-backend-redis-server=magento2-redis-master
+yes | php "${DEVBOX_ROOT}/$(getContext)/bin/magento" setup:config:set --session-save=redis --session-save-redis-host=magento2-redis-master
 
 if [[ $? != 0 ]]; then
     error "Magento installation failed."

tests/README.md

@@ -7,4 +7,4 @@ Current project contains functional tests for [Kubernetes DevBox for Magento 2 D
  1. Make sure that your host meets requirements listed [here](https://github.com/magento/magento2-kubernetes-devbox#requirements)
  1. Copy [configuration.sh.dist](include/configuration.sh.dist) to `include/configuration.sh` and make necessary changes
  1. Copy [auth.json.dist](include/auth.json.dist) to `include/auth.json` and add valid keys. This step is required only for testing of Composer-based installations
- 1. Run [testsuite.sh](testsuite.sh) in bash
+ 1. Run [NoCustomConfigBasicTest.sh](NoCustomConfigBasicTest.sh) or any other test in bash