Update the base image to include sops. This also updates to kubectl 1.10

Dockerfile

@@ -1,4 +1,4 @@
-FROM datawire/forge-base:4
+FROM datawire/forge-base:5
 
 WORKDIR /work
 

Dockerfile.base

@@ -31,6 +31,9 @@ RUN curl -L https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/${
 # imagebuilder
 RUN GOPATH=/tmp/gp go get -u github.com/openshift/imagebuilder/cmd/imagebuilder && mv /tmp/gp/bin/imagebuilder /usr/local/bin && rm -rf /tmp/gp
 
+# sops
+RUN curl -L https://github.com/mozilla/sops/releases/download/3.0.3/sops-3.0.3.linux -o /usr/local/bin/sops && chmod a+x /usr/local/bin/sops
+
 # kubernaut
 RUN curl -L https://s3.amazonaws.com/datawire-static-files/kubernaut/$(curl -s https://s3.amazonaws.com/datawire-static-files/kubernaut/stable.txt)/kubernaut -o /usr/local/bin/kubernaut
 RUN chmod +x /usr/local/bin/kubernaut

forge/tests/blackbox/delete/test.spec

@@ -1,41 +1,41 @@
 RUN forge -v deploy
 RUN kubectl get svc,deploy --all-namespaces -oname -lforge.service=delete,forge.profile=default
-OUT services/delete-default
-OUT services/delete-default-namespaced
-OUT deployments/delete-default
-OUT deployments/delete-default-namespaced
+OUT service/delete-default
+OUT service/delete-default-namespaced
+OUT deployment.extensions/delete-default
+OUT deployment.extensions/delete-default-namespaced
 
 RUN forge -v --profile foo deploy
 RUN kubectl get svc,deploy --all-namespaces -oname -lforge.service=delete,forge.profile=foo
-OUT services/delete-foo
-OUT services/delete-foo-namespaced
-OUT deployments/delete-foo
-OUT deployments/delete-foo-namespaced
+OUT service/delete-foo
+OUT service/delete-foo-namespaced
+OUT deployment.extensions/delete-foo
+OUT deployment.extensions/delete-foo-namespaced
 
 RUN forge delete delete foo
-OUT deployment "delete-foo" deleted
+OUT deployment.extensions "delete-foo" deleted
 OUT endpoints "delete-foo" deleted
 OUT service "delete-foo" deleted
 
 RUN kubectl get svc,deploy --all-namespaces -oname -lforge.service=delete,forge.profile=default
-OUT services/delete-default
-OUT deployments/delete-default
+OUT service/delete-default
+OUT deployment.extensions/delete-default
 
 RUN forge -v --profile foo deploy
 RUN kubectl get svc,deploy --all-namespaces -oname -lforge.service=delete,forge.profile=foo
-OUT services/delete-foo
-OUT deployments/delete-foo
+OUT service/delete-foo
+OUT deployment.extensions/delete-foo
 
 RUN forge delete delete
 RUN kubectl get svc,deploy --all-namespaces -lforge.service=delete
 OUT No resources found.
 
 RUN forge -v deploy
 RUN kubectl get svc,deploy --all-namespaces -oname -lforge.service=delete,forge.profile=default
-OUT services/delete-default
-OUT services/delete-default-namespaced
-OUT deployments/delete-default
-OUT deployments/delete-default-namespaced
+OUT service/delete-default
+OUT service/delete-default-namespaced
+OUT deployment.extensions/delete-default
+OUT deployment.extensions/delete-default-namespaced
 
 TIMEOUT 60
 

forge/tests/blackbox/prune/test.spec

@@ -2,4 +2,4 @@ RUN forge -v deploy
 RUN sed -i s/-foo/-bar/ k8s/deployment.yaml
 RUN forge -v deploy --prune
 OUT service "prune-default-foo" pruned
-OUT deployment "prune-default-foo" pruned
+OUT deployment.extensions "prune-default-foo" pruned

forge/tests/blackbox/tagging/test.spec

@@ -5,8 +5,8 @@ RUN git remote add origin https://github.com/datawire/forge.git
 
 RUN forge -v deploy
 RUN kubectl get svc,deploy -l forge.service=tagging -l forge.profile=default -o name
-OUT services/tagging-default
-OUT deployments/tagging-default
+OUT service/tagging-default
+OUT deployment.extensions/tagging-default
 RUN kubectl get svc/tagging-default -o 'go-template={{range $k, $v := .metadata.annotations}}{{$k}}: {{$v}}{{"\n"}}{{end}}'
 OUT forge.descriptor: service.yaml
 OUT forge.repo: https://github.com/datawire/forge.git
@@ -18,18 +18,18 @@ OUT No resources found.
 RUN forge --profile foo -v deploy
 
 RUN kubectl get svc,deploy -l forge.service=tagging -l forge.profile=default -o name
-OUT services/tagging-default
-OUT deployments/tagging-default
+OUT service/tagging-default
+OUT deployment.extensions/tagging-default
 
 RUN kubectl get svc,deploy -l forge.service=tagging -l forge.profile=foo -o name
-OUT services/tagging-foo
-OUT deployments/tagging-foo
+OUT service/tagging-foo
+OUT deployment.extensions/tagging-foo
 
 RUN kubectl get svc,deploy -l forge.service=tagging -o name
-OUT services/tagging-default
-OUT services/tagging-foo
-OUT deployments/tagging-default
-OUT deployments/tagging-foo
+OUT service/tagging-default
+OUT service/tagging-foo
+OUT deployment.extensions/tagging-default
+OUT deployment.extensions/tagging-foo
 
 RUN kubectl get ns -lforge.service
 OUT No resources found.

forge/tests/test_forge.py

@@ -184,7 +184,7 @@ def test_deploy():
         forge.expect('forgetest-[0-9-]+:')
         forge.expect('rendered')
         forge.expect('service/forgetest-[0-9-]+')
-        forge.expect('deployment/forgetest-[0-9-]+')
+        forge.expect('deployment.extensions/forgetest-[0-9-]+')
         forge.expect('deployed')
         forge.expect('forgetest-[0-9-]+')
         forge.expect(pexpect.EOF)
@@ -194,7 +194,7 @@ def test_deploy():
             forge = launch(os.path.join(directory, "forgetest/subdir"), "forge deploy")
             forge.expect('rendered')
             forge.expect('service/forgetest-[0-9-]+')
-            forge.expect('deployment/forgetest-[0-9-]+')
+            forge.expect('deployment.extensions/forgetest-[0-9-]+')
             forge.expect('deployed')
             forge.expect('forgetest-[0-9-]+')
             forge.expect(pexpect.EOF)

forge/tests/test_kubernetes.py

@@ -68,7 +68,7 @@ def test_resources():
     kube = Kubernetes()
     resources = kube.resources(os.path.join(directory, "k8s"))
     assert mangle('service/kube-test-service-MANGLE') in resources
-    assert mangle('deployment/kube-test-deployment-MANGLE') in resources
+    assert mangle('deployment.extensions/kube-test-deployment-MANGLE') in resources
 
 def kget(namespace, type, name):
     cmd = "kubectl", "get", "-o", "name", type, name
@@ -83,8 +83,8 @@ def test_apply(namespace=None):
     directory = mktree(K8S_TREE, MANGLE=MANGLE)
     kube = Kubernetes(namespace=namespace)
     kube.apply(os.path.join(directory, "k8s"))
-    kcheck(namespace, "services", "kube-test-service-MANGLE")
-    kcheck(namespace, "deployments", "kube-test-deployment-MANGLE")
+    kcheck(namespace, "service", "kube-test-service-MANGLE")
+    kcheck(namespace, "deployment.extensions", "kube-test-deployment-MANGLE")
 
 def test_apply_namespace():
     sh("kubectl", "create", "namespace", mangle("dev-MANGLE"))