Merge pull request #6 from magento/nfs-storage-class

Add plugin and remove wait hacks

Author: valdislav

README.md

@@ -109,16 +109,18 @@ The software listed below should be available in [PATH](https://en.wikipedia.org
     # NFS configuration is needed just once for each project, it will prompt for your password to make changes on the host
     bash scripts/host/configure_nfs_exports.sh
     
-    bash init_project.sh
+    helm plugin install .
+    
+    helm init-magento
     ```
     To initialize project with checkout container,
     clone sources to checkout directory and use -e parameter to init_project.sh call.
     ```
-    bash init_project.sh -e
+    helm init-magento -e
     ```
     If yiu have issues with nfs. To use filesystem mount instead of nfs use -d parameter to init_project.sh call.
     ```
-    bash init_project.sh -d
+    helm init-magento -d
     ```
 
  1. Use the `magento2-devbox` directory as the project root in PHP Storm (not `magento2-devbox/magento`). This is important, because in this case PHP Storm will be configured automatically by [init_project.sh](init_project.sh).<!-- If NFS files sync is disabled in [config](etc/config.yaml.dist) and ![](docs/images/windows-icon.png)on Windows hosts [verify the deployment configuration in PHP Storm](docs/phpstorm-configuration-windows-hosts.md).-->

etc/helm/requirements.yaml

@@ -10,6 +10,6 @@ dependencies:
   repository: "@stable"
   version: "3.6.3"
 - name: checkout
-  repository: http://localhost:10191
+  repository: file://./charts/
   version: 0.1.0
   condition: global.checkout.enabled

init_project.sh

@@ -245,8 +245,8 @@ if [[ $(isMinikubeRunning) -eq 0 ]]; then
 fi
 status "Configuring kubernetes cluster on the minikube"
 # TODO: Optimize. Helm tiller must be initialized and started before environment configuration can begin
-helm init
-waitForKubernetesPodToRun 'tiller-deploy'
+helm init --wait
+#waitForKubernetesPodToRun 'tiller-deploy'
 
 # TODO: change k-rebuild-environment to comply with formatting requirements
 if [[ "${disable_nfs}" == 1 ]]; then

plugin.yaml

@@ -0,0 +1,8 @@
+name: "init-magento"
+version: "0.1.0"
+usage: "Init magento project"
+description: |-
+  This plugin runs minikube, clone magento repo and initialize helm project.
+ignoreFlags: false
+useTunnel: false
+command: "$HELM_PLUGIN_DIR/init_project.sh"

scripts/host/k_rebuild_environment.sh

@@ -32,14 +32,15 @@ done
 cd "${vagrant_dir}/etc/helm" && helm install \
     --name magento2 \
     --values values.yaml \
+    --wait \
     --set global.monolith.volumeHostPath="${vagrant_dir}" \
     --set global.persistence.nfs.enabled="${enable_nfs}" \
     --set global.checkout.enabled="${enable_checkout}" \
     --set global.checkout.volumeHostPath="${vagrant_dir}" .
 
 # TODO: Waiting for containers to initialize before proceeding
-waitForKubernetesPodToRun 'magento2-monolith'
-waitForKubernetesPodToRun 'magento2-mysql'
-waitForKubernetesPodToRun 'magento2-redis-master'
+#waitForKubernetesPodToRun 'magento2-monolith'
+#waitForKubernetesPodToRun 'magento2-mysql'
+#waitForKubernetesPodToRun 'magento2-redis-master'
 
 exit 0