Revert "Add helmfile/terraform runner with hierarchical configuration support"

.gitignore

@@ -1,8 +1,4 @@
 ops.egg-info/
-*.plan
-*.tf.json
-*.tfvars.json
-*.tfstate
 .cache/
 *.pyc
 .terraform

README.md

@@ -59,10 +59,6 @@ ops clusters/mycluster.yaml terraform --path-name aws-eks apply
 
 ![ops-terraform](https://user-images.githubusercontent.com/952836/52021396-9bc1b580-24fd-11e9-9da8-00fb68bd5c72.png)
 
-## Run terraform by using hierarchical configs
-
-See [examples/features/terraform-hierarchical](https://github.com/adobe/ops-cli/tree/master/examples/features/terraform-hierarchical)
-
 ## Create Kubernetes cluster (using AWS EKS)
 
 See [examples/aws-kubernetes](https://github.com/adobe/ops-cli/tree/master/examples/aws-kubernetes)
@@ -89,8 +85,8 @@ pip2 install -U virtualenv
 virtualenv ops
 source ops/bin/activate
 
-# install opswrapper v1.0 stable release
-pip2 install --upgrade https://github.com/adobe/ops-cli/releases/download/1.0/ops-1.0.tar.gz
+# install opswrapper v0.36 stable release
+pip2 install --upgrade https://github.com/adobe/ops-cli/releases/download/0.36/ops-0.36.tar.gz
 
 # Optionally, install terraform to be able to access terraform plugin
 # See https://www.terraform.io/intro/getting-started/install.html
@@ -103,7 +99,7 @@ You can try out `ops-cli`, by using docker. The docker image has all required pr
 
 To start out a container, running the latest `ops-cli` docker image run:
 ```sh
-docker run -it adobe/ops-cli:1.0 bash
+docker run -it adobe/ops-cli:0.36 bash
 ```
 
 After the container has started, you can start using `ops-cli`:

build_scripts/Dockerfile

@@ -73,7 +73,6 @@ RUN curl -sSL https://github.com/databus23/helm-diff/releases/download/v${HELM_D
 
 USER root
 RUN HELM_HOME=/home/ops/.helm helm plugin install https://github.com/futuresimple/helm-secrets
-RUN HELM_HOME=/home/ops/.helm helm plugin install https://github.com/rimusz/helm-tiller
 RUN chown -R ops:ops /home/ops/.helm/plugins
 
 COPY --from=compile-image /azure-cli /home/ops/.local/azure-cli

build_scripts/docker_push.sh

@@ -2,5 +2,5 @@
 set -e
 
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker tag ops adobe/ops-cli:1.0
-docker push adobe/ops-cli:1.0
+docker tag ops adobe/ops-cli:0.36
+docker push adobe/ops-cli:0.36

requirements.txt

@@ -1,9 +1,9 @@
 simpledi>=0.2
-awscli==1.16.97
-boto3==1.9.87
+awscli==1.16.206
+ansible==2.7.10
+boto3==1.9.196
 boto==2.49.0
-urllib3==1.24
-ansible==2.7.12
+botocore==1.12.196
 PyYAML==3.13
 azure-common==1.1.20
 azure==4.0.0
@@ -15,6 +15,3 @@ hvac==0.9.3
 passgen
 inflection==0.3.1
 kubernetes==9.0.0
-deepmerge==0.0.5
-lru_cache==0.2.3
-backports.functools_lru_cache==1.5

setup.py

@@ -16,7 +16,7 @@
 _requires = [ r for r in open(os.path.sep.join((_mydir,'requirements.txt')), "r").read().split('\n') if len(r)>1 ]
 setup(
     name='ops',
-    version='1.0',
+    version='0.36',
     description='Ops simple wrapper',
     author='Adobe',
     author_email='noreply@adobe.com',

src/ops/__init__.py

@@ -58,4 +58,3 @@ def shadow_credentials(self, cmd):
 
 class OpsException(Exception):
     pass
-

src/ops/cli/config.py

@@ -52,9 +52,6 @@ def all(self):
     def __contains__(self, item):
         return item in self.conf or item in self.ops_config
 
-    def __setitem__(self, key, val):
-        self.conf[key] = val
-
     def __getitem__(self, item):
         if item not in self.conf and item not in self.ops_config:
             msg = "Configuration value %s not found; update your %s" % (item, self.cluster_config_path)
@@ -119,9 +116,6 @@ def __init__(self, console_args, cluster_config_path, template):
         self.console_args = console_args
 
     def get(self):
-        if os.path.isdir(self.cluster_config_path):
-            return {"cluster": None, "inventory": None}
-
         data_loader = DataLoader()
         # data_loader.set_vault_password('627VR8*;YU99B')
         variable_manager = VariableManager(loader=data_loader)