kubes 0.3.2 → 0.4.1

data/spec/fixtures/decorators/deployment/both/volumes.yaml

@@ -0,0 +1,40 @@
+---
+metadata:
+  namespace: default
+  labels:
+    app: demo
+    role: web
+  name: demo-web
+spec:
+  selector:
+    matchLabels:
+      app: demo
+      role: web
+  template:
+    metadata:
+      labels:
+        app: demo
+        role: web
+    spec:
+      containers:
+      - name: demo-web
+        image: gcr.io/project/demo-web:kubes-2020-06-23T00-07-54
+        volumeMounts:
+        - mountPath: /config-map
+          name: config-map-volume
+      volumes:
+      - configMap:
+          name: demo-config-map
+          items:
+          - key: k1
+            path: config-map.conf
+        name: config-map-volume
+      - secret:
+          secretName: demo-secret
+          items:
+          - key: k1
+            path: secrets.conf
+        name: secrets-volume
+  replicas: 1
+apiVersion: apps/v1
+kind: Pod

data/spec/fixtures/prune/capture.yaml

@@ -0,0 +1,57 @@
+---
+- apiVersion: v1
+  data:
+    ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLekNDQWhPZ0F3SUJBZ0lSQUw5UTRFZXFyS0t2ZXYwWFhaMCtMOFV3RFFZSktvWklodmNOQVFFTEJRQXcKTHpFdE1Dc0dBMVVFQXhNa05UUXpPVGczWXpBdE5qRTRaaTAwTlRRMkxXRTRNemt0WmpBd016WmlaR0ZrTURRMgpNQjRYRFRJd01UQXdOakl4TkRNeE5Gb1hEVEkxTVRBd05USXlORE14TkZvd0x6RXRNQ3NHQTFVRUF4TWtOVFF6Ck9UZzNZekF0TmpFNFppMDBOVFEyTFdFNE16a3RaakF3TXpaaVpHRmtNRFEyTUlJQklqQU5CZ2txaGtpRzl3MEIKQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdGhoK2xLbTRjNm4zSjl3ZWFxQTdYRFFPSFNlOUw1VmRYOUJiem5lcQpLR21nM0pFWkVQWHJvZ3B5YmpYNFU5NXJuTUNWM2JPQkhYaFJaaGZibE5wdlVJTlZVdnl0Y1ZpMDkzU1JaUFB6CkgwTmV4Z0YxVFUrWi85VlRWWDhZNHBoaURiR0pCdnFGV1JxWTV3OGpTSUhad2lOd04vSlQ1VFIxZEJNWC9CN1cKNGNxMHRjQjNwVkxnZDJPcThSODdhdm9rZzQ5a1BHd3J1WUZJTVppTTM2VldmOWNFV3duVnp5WEV3UDhhT21kZApmaDFEL2oydk1obmg3THZjS09NbVRaQWJrSy80YjlqMjVjTU1TNTdoZDFwU0hCdFRCcmRrNnA5Tjcxd2MyeUkzCm5KektBQ1U0WG1NRzRodGlzQlFTTjRzUGxlNHZhT1FLSGtlSFY1aFVGZkhFYXdJREFRQUJvMEl3UURBT0JnTlYKSFE4QkFmOEVCQU1DQWdRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVUxiWU82S1drVnVHVgpkSTE3c3dRQkpORC9NTGN3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUhqc1lXZUhzU2VOc01XTzl4SGxsVWpUCjBHU0I5USt2aXNQejNBVWdUNy9uQU0wRW1kREdIQjFhVzVPQ2FTTXVtRWFhMHVkQjVkbTV1c1pQUEN5cDFrckUKdS90UUxmVStPQmtmZE1keTZFREdEcHJtVmsxWW1xa2FvWjFGUWZKQXI0WGRGQVB1OWM4WVJqaUlxMFV0c1c3cQo1dDc4SjBhYmtpdGxncW5kcWI5WHpkWEI5NUZmajF2Sk9hbnFWWGlYQzBIeVExNlJWUEtCOG5tajYzL1pjeFdECkIzdGlOUG9hUmF0cVhoL293MDYxRlRGWHQzNUZnV01QeWlWWXMzTG5HNFZQRHRibFBqSXRxaC9BSTl3ZXNEbUoKdCt4TkgreHk2L3JPTmY3YldvZjM1cWxXVnVBQjdIOXk0NTFGd3VBd3ZNY3B1cHNIenNrTGNCY3UvYUxmT0prPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+    namespace: Z2FyZGVu
+    token: ZXlKaGJHY2lPaUpTVXpJMU5pSXNJbXRwWkNJNkluWlNRMTlTWlhoMWVqSnRlbnBYVTNwdFRETmhXa1UxWjJsU1NGQTNVVFZ1Um5KM1dubE1TR3czUzI4aWZRLmV5SnBjM01pT2lKcmRXSmxjbTVsZEdWekwzTmxjblpwWTJWaFkyTnZkVzUwSWl3aWEzVmlaWEp1WlhSbGN5NXBieTl6WlhKMmFXTmxZV05qYjNWdWRDOXVZVzFsYzNCaFkyVWlPaUpuWVhKa1pXNGlMQ0pyZFdKbGNtNWxkR1Z6TG1sdkwzTmxjblpwWTJWaFkyTnZkVzUwTDNObFkzSmxkQzV1WVcxbElqb2laR1ZtWVhWc2RDMTBiMnRsYmkxeGR6ZHVjQ0lzSW10MVltVnlibVYwWlhNdWFXOHZjMlZ5ZG1salpXRmpZMjkxYm5RdmMyVnlkbWxqWlMxaFkyTnZkVzUwTG01aGJXVWlPaUprWldaaGRXeDBJaXdpYTNWaVpYSnVaWFJsY3k1cGJ5OXpaWEoyYVdObFlXTmpiM1Z1ZEM5elpYSjJhV05sTFdGalkyOTFiblF1ZFdsa0lqb2lZekE0T1RWalpUSXRZV00xWlMwME5HUmtMV0UxTlRZdFpEY3lOR1pqTlRkaE1qSTJJaXdpYzNWaUlqb2ljM2x6ZEdWdE9uTmxjblpwWTJWaFkyTnZkVzUwT21kaGNtUmxianBrWldaaGRXeDBJbjAuRFpFTDNFZURHa182WEhlVWJ2QWJGanZ1aDBROHdKMmFpWTI2YWk2UVdPQTVSVlV1Ulcwbkx6c2VnVVBvN0dkR1g0ejAtUGpKNGY3bzJGRjMxVHh1ZVF0MkJUMW1nZGdONVVDR1ZCY0xuVVRURzdZZVJPUzFhd3FUQ2pYWDgzTG03VDQ2R3Fmbi1tVWkxUnVNdUlvUm1KRWVTYUxaekdPNFFPOGhBVTVOaTJJNTBYblRUQXJ3TW84TS1mZjI0N3U1RmMyaFVWUndmZW9DdVAxNVJEU05DUk1rSVBYaGMxOEFxUkZLc1l5T3JJRHNWcGFuNFIwRXQwM3pUOTVjeE8wZEowd1dBeXFiVUw0M3VvaTZaa0NnNmRrb191Z1FuNWgtcEFlYjJybGNIbDNFUUdNcl9QTndVWDI0OVNyeG02MW1Pa25fMHlZMS1DQkVUWG5CUEtHRW5R
+  kind: Secret
+  metadata:
+    annotations:
+      kubernetes.io/service-account.name: default
+      kubernetes.io/service-account.uid: c0895ce2-ac5e-44dd-a556-d724fc57a226
+    creationTimestamp: '2020-10-07T19:04:11Z'
+    name: default-token-qw7np
+    namespace: garden
+    resourceVersion: '486470'
+    selfLink: "/api/v1/namespaces/garden/secrets/default-token-qw7np"
+    uid: ec42ba8b-7c03-4ab2-9e95-5a144b3f5938
+  type: kubernetes.io/service-account-token
+- apiVersion: v1
+  data:
+    foo: Zm9vCg==
+    password: cGFzcw==
+    username: dXNlcg==
+  kind: Secret
+  metadata:
+    annotations:
+      kubectl.kubernetes.io/last-applied-configuration: '{"apiVersion":"v1","data":{"foo":"Zm9vCg==","password":"cGFzcw==","username":"dXNlcg=="},"kind":"Secret","metadata":{"annotations":{},"labels":{"app":"garden"},"name":"demo-secret-CURRENT111","namespace":"garden"}}
+
+'
+    creationTimestamp: '2020-10-08T19:42:41Z'
+    labels:
+      app: garden
+    name: demo-secret-CURRENT111
+    namespace: garden
+    resourceVersion: '1075012'
+    selfLink: "/api/v1/namespaces/garden/secrets/demo-secret-CURRENT111"
+    uid: 63c386ad-0069-4767-b0b8-e70dbafb7c9c
+  type: Opaque
+- apiVersion: v1
+  data:
+    password: cGFzcw==
+    username: dXNlcg==
+  kind: Secret
+  metadata:
+    annotations:
+      kubectl.kubernetes.io/last-applied-configuration: '{"apiVersion":"v1","data":{"password":"cGFzcw==","username":"dXNlcg=="},"kind":"Secret","metadata":{"annotations":{},"labels":{"app":"garden"},"name":"demo-secret-OLD1111111","namespace":"garden"}}
+
+'
+    creationTimestamp: '2020-10-07T19:04:12Z'
+    labels:
+      app: garden
+    name: demo-secret-OLD1111111
+    namespace: garden
+    resourceVersion: '486474'
+    selfLink: "/api/v1/namespaces/garden/secrets/demo-secret-OLD1111111"
+    uid: a45afce3-a418-478e-8e13-b6e6041ad2e1
+  type: Opaque

data/spec/fixtures/prune/fetch_items.yaml

@@ -0,0 +1,268 @@
+---
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    annotations:
+      deployment.kubernetes.io/revision: '2'
+      kubectl.kubernetes.io/last-applied-configuration: '{"apiVersion":"apps/v1","kind":"Deployment","metadata":{"annotations":{},"labels":{"app":"garden","role":"clock"},"name":"clock","namespace":"garden"},"spec":{"replicas":1,"revisionHistoryLimit":0,"selector":{"matchLabels":{"app":"garden","role":"clock"}},"template":{"metadata":{"labels":{"app":"garden","role":"clock"}},"spec":{"containers":[{"envFrom":[{"secretRef":{"name":"demo-secret-OLD1111111"}}],"image":"gcr.io/PROJECT/secret:kubes-2020-10-08T19-42-34-a428e44","name":"clock"}]}}}}
+
+'
+    creationTimestamp: '2020-10-08T02:24:30Z'
+    generation: 3
+    labels:
+      app: garden
+      role: clock
+    name: clock
+    namespace: garden
+    resourceVersion: '1076690'
+    selfLink: "/apis/apps/v1/namespaces/garden/deployments/clock"
+    uid: 6c6234bd-e7e8-421c-856d-10e6f0ae18df
+  spec:
+    progressDeadlineSeconds: 600
+    replicas: 1
+    revisionHistoryLimit: 0
+    selector:
+      matchLabels:
+        app: garden
+        role: clock
+    strategy:
+      rollingUpdate:
+        maxSurge: 25%
+        maxUnavailable: 25%
+      type: RollingUpdate
+    template:
+      metadata:
+        creationTimestamp:
+        labels:
+          app: garden
+          role: clock
+      spec:
+        containers:
+        - envFrom:
+          - secretRef:
+              name: demo-secret-OLD1111111
+          image: gcr.io/PROJECT/secret:kubes-2020-10-08T19-42-34-a428e44
+          imagePullPolicy: IfNotPresent
+          name: clock
+          resources: {}
+          terminationMessagePath: "/dev/termination-log"
+          terminationMessagePolicy: File
+        dnsPolicy: ClusterFirst
+        restartPolicy: Always
+        schedulerName: default-scheduler
+        securityContext: {}
+        terminationGracePeriodSeconds: 30
+  status:
+    availableReplicas: 1
+    conditions:
+    - lastTransitionTime: '2020-10-08T02:24:31Z'
+      lastUpdateTime: '2020-10-08T19:42:45Z'
+      message: ReplicaSet "clock-6f9f9d47cb" has successfully progressed.
+      reason: NewReplicaSetAvailable
+      status: 'True'
+      type: Progressing
+    - lastTransitionTime: '2020-10-08T19:46:34Z'
+      lastUpdateTime: '2020-10-08T19:46:34Z'
+      message: Deployment has minimum availability.
+      reason: MinimumReplicasAvailable
+      status: 'True'
+      type: Available
+    observedGeneration: 3
+    readyReplicas: 1
+    replicas: 1
+    updatedReplicas: 1
+- apiVersion: batch/v1
+  kind: Job
+  metadata:
+    annotations:
+      kubectl.kubernetes.io/last-applied-configuration: '{"apiVersion":"batch/v1","kind":"Job","metadata":{"annotations":{},"name":"migrate","namespace":"garden"},"spec":{"backoffLimit":4,"template":{"spec":{"containers":[{"command":["sleep","60"],"envFrom":[{"secretRef":{"name":"demo-secret-CURRENT111"}}],"image":"gcr.io/PROJECT/secret:kubes-2020-10-07T20-12-16-84dbc4e","name":"migrate"}],"restartPolicy":"Never"}}}}
+
+'
+    creationTimestamp: '2020-10-07T20:12:29Z'
+    labels:
+      controller-uid: a5dbf73c-a49f-4eca-993e-7ab6db0946c8
+      job-name: migrate
+    name: migrate
+    namespace: garden
+    resourceVersion: '514227'
+    selfLink: "/apis/batch/v1/namespaces/garden/jobs/migrate"
+    uid: a5dbf73c-a49f-4eca-993e-7ab6db0946c8
+  spec:
+    backoffLimit: 4
+    completions: 1
+    parallelism: 1
+    selector:
+      matchLabels:
+        controller-uid: a5dbf73c-a49f-4eca-993e-7ab6db0946c8
+    template:
+      metadata:
+        creationTimestamp:
+        labels:
+          controller-uid: a5dbf73c-a49f-4eca-993e-7ab6db0946c8
+          job-name: migrate
+      spec:
+        containers:
+        - command:
+          - sleep
+          - '60'
+          envFrom:
+          - secretRef:
+              name: demo-secret-CURRENT111
+          image: gcr.io/PROJECT/secret:kubes-2020-10-07T20-12-16-84dbc4e
+          imagePullPolicy: IfNotPresent
+          name: migrate
+          resources: {}
+          terminationMessagePath: "/dev/termination-log"
+          terminationMessagePolicy: File
+        dnsPolicy: ClusterFirst
+        restartPolicy: Never
+        schedulerName: default-scheduler
+        securityContext: {}
+        terminationGracePeriodSeconds: 30
+  status:
+    completionTime: '2020-10-07T20:13:31Z'
+    conditions:
+    - lastProbeTime: '2020-10-07T20:13:31Z'
+      lastTransitionTime: '2020-10-07T20:13:31Z'
+      status: 'True'
+      type: Complete
+    startTime: '2020-10-07T20:12:29Z'
+    succeeded: 1
+- apiVersion: v1
+  kind: Namespace
+  metadata:
+    annotations:
+      kubectl.kubernetes.io/last-applied-configuration: '{"apiVersion":"v1","kind":"Namespace","metadata":{"annotations":{},"labels":{"app":"garden"},"name":"garden"}}
+
+'
+    creationTimestamp: '2020-10-07T19:04:11Z'
+    labels:
+      app: garden
+    name: garden
+    resourceVersion: '486464'
+    selfLink: "/api/v1/namespaces/garden"
+    uid: 3db2c4cf-40b9-42cd-96f4-7f0aebff80e1
+  spec:
+    finalizers:
+    - kubernetes
+  status:
+    phase: Active
+- apiVersion: v1
+  data:
+    foo: Zm9vCg==
+    password: cGFzcw==
+    username: dXNlcg==
+  kind: Secret
+  metadata:
+    annotations:
+      kubectl.kubernetes.io/last-applied-configuration: '{"apiVersion":"v1","data":{"foo":"Zm9vCg==","password":"cGFzcw==","username":"dXNlcg=="},"kind":"Secret","metadata":{"annotations":{},"labels":{"app":"garden"},"name":"demo-secret-OLD1111111","namespace":"garden"}}
+
+'
+    creationTimestamp: '2020-10-08T19:42:41Z'
+    labels:
+      app: garden
+    name: demo-secret-OLD1111111
+    namespace: garden
+    resourceVersion: '1075012'
+    selfLink: "/api/v1/namespaces/garden/secrets/demo-secret-OLD1111111"
+    uid: 63c386ad-0069-4767-b0b8-e70dbafb7c9c
+  type: Opaque
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    annotations:
+      deployment.kubernetes.io/revision: '5'
+      kubectl.kubernetes.io/last-applied-configuration: '{"apiVersion":"apps/v1","kind":"Deployment","metadata":{"annotations":{},"labels":{"app":"garden","role":"web"},"name":"web","namespace":"garden"},"spec":{"replicas":1,"revisionHistoryLimit":0,"selector":{"matchLabels":{"app":"garden","role":"web"}},"template":{"metadata":{"labels":{"app":"garden","role":"web"}},"spec":{"containers":[{"envFrom":[{"secretRef":{"name":"demo-secret-OLD1111111"}}],"image":"gcr.io/PROJECT/secret:kubes-2020-10-08T19-42-34-a428e44","name":"web"}]}}}}
+
+'
+    creationTimestamp: '2020-10-07T19:04:14Z'
+    generation: 6
+    labels:
+      app: garden
+      role: web
+    name: web
+    namespace: garden
+    resourceVersion: '1076735'
+    selfLink: "/apis/apps/v1/namespaces/garden/deployments/web"
+    uid: 31b562a8-1a35-4bf6-972d-f2d44a47e149
+  spec:
+    progressDeadlineSeconds: 600
+    replicas: 1
+    revisionHistoryLimit: 0
+    selector:
+      matchLabels:
+        app: garden
+        role: web
+    strategy:
+      rollingUpdate:
+        maxSurge: 25%
+        maxUnavailable: 25%
+      type: RollingUpdate
+    template:
+      metadata:
+        creationTimestamp:
+        labels:
+          app: garden
+          role: web
+      spec:
+        containers:
+        - envFrom:
+          - secretRef:
+              name: demo-secret-OLD1111111
+          image: gcr.io/PROJECT/secret:kubes-2020-10-08T19-42-34-a428e44
+          imagePullPolicy: IfNotPresent
+          name: web
+          resources: {}
+          terminationMessagePath: "/dev/termination-log"
+          terminationMessagePolicy: File
+        dnsPolicy: ClusterFirst
+        restartPolicy: Always
+        schedulerName: default-scheduler
+        securityContext: {}
+        terminationGracePeriodSeconds: 30
+  status:
+    availableReplicas: 1
+    conditions:
+    - lastTransitionTime: '2020-10-07T19:04:14Z'
+      lastUpdateTime: '2020-10-08T19:42:46Z'
+      message: ReplicaSet "web-9c4796f88" has successfully progressed.
+      reason: NewReplicaSetAvailable
+      status: 'True'
+      type: Progressing
+    - lastTransitionTime: '2020-10-08T19:46:40Z'
+      lastUpdateTime: '2020-10-08T19:46:40Z'
+      message: Deployment has minimum availability.
+      reason: MinimumReplicasAvailable
+      status: 'True'
+      type: Available
+    observedGeneration: 6
+    readyReplicas: 1
+    replicas: 1
+    updatedReplicas: 1
+- apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      kubectl.kubernetes.io/last-applied-configuration: '{"apiVersion":"v1","kind":"Service","metadata":{"annotations":{},"labels":{"role":"web"},"name":"web","namespace":"garden"},"spec":{"ports":[{"port":80,"protocol":"TCP","targetPort":80}],"selector":{"role":"web"},"type":"ClusterIP"}}
+
+'
+    creationTimestamp: '2020-10-07T19:04:13Z'
+    labels:
+      role: web
+    name: web
+    namespace: garden
+    resourceVersion: '486485'
+    selfLink: "/api/v1/namespaces/garden/services/web"
+    uid: 51eb23f5-d107-4554-b096-a4a081dfee5d
+  spec:
+    clusterIP: 10.12.10.177
+    ports:
+    - port: 80
+      protocol: TCP
+      targetPort: 80
+    selector:
+      role: web
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}

data/spec/kubes/cli/prune_spec.rb

@@ -0,0 +1,38 @@
+describe Kubes::CLI::Prune do
+  let(:prune) do
+    prune = described_class.new
+    allow(prune).to receive(:sure?)
+    allow(prune).to receive(:capture_items).and_return(capture)
+    allow(prune).to receive(:logger).and_return(null)
+    prune
+  end
+  let(:null) { double(:null).as_null_object }
+
+  let(:fetcher) do
+    fetcher = double(:fetcher).as_null_object
+    allow(fetcher).to receive(:fetch_items).and_return(fetch_items)
+    fetcher
+  end
+  before(:each) do
+    allow(Kubes::Kubectl::Fetch::Base).to receive(:new).and_return(fetcher)
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:md5s).and_return(built_kinds)
+  end
+
+  context("old resources") do
+    let(:fetch_items) { fixture("fetch_items.yaml") }
+    let(:capture) { fixture("capture.yaml") }
+    let(:built_kinds) do
+      {"Secret"=>{"demo-secret"=>"CURRENT111"}}
+    end
+
+    it "run" do
+      allow(Kubes::Kubectl).to receive(:execute)
+      prune.run
+      expect(Kubes::Kubectl).to have_received(:execute).at_least(:once)
+    end
+  end
+
+  def fixture(file)
+    YAML.load_file("spec/fixtures/prune/#{file}")
+  end
+end

data/spec/kubes/compiler/decorator/{resources → post}/deployment_spec.rb

@@ -1,11 +1,14 @@
-describe Kubes::Compiler::Decorator::Resources::Deployment do
+describe Kubes::Compiler::Decorator::Post do
   let(:decorator) { described_class.new(data) }
 
   def fixture(name)
     YAML.load_file("spec/fixtures/decorators/deployment/#{name}.yaml")
   end
   before(:each) do
-    allow(Kubes::Compiler::Decorator).to receive(:fetch).and_return("fakehash")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).and_return("fakehash")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("Secret", "demo-secret").and_return("fakehash")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("ConfigMap", "demo-config-map").and_return("fakehash-config")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("ConfigMap", "demo-config-map-2").and_return("fakehash-config2")
   end
 
   context "secret" do
@@ -56,7 +59,7 @@ describe Kubes::Compiler::Decorator::Resources::Deployment do
         decorator.run
         data = decorator.data
         name = data['spec']['template']['spec']['containers'][0]['envFrom'][0]['configMapRef']['name']
-        expect(name).to eq("demo-config-map-fakehash")
+        expect(name).to eq("demo-config-map-fakehash-config")
       end
     end
 
@@ -66,7 +69,7 @@ describe Kubes::Compiler::Decorator::Resources::Deployment do
         decorator.run
         data = decorator.data
         name = data['spec']['template']['spec']['containers'][0]['env'][0]['valueFrom']['configMapKeyRef']['name']
-        expect(name).to eq("demo-config-map-fakehash")
+        expect(name).to eq("demo-config-map-fakehash-config")
       end
     end
 
@@ -76,7 +79,7 @@ describe Kubes::Compiler::Decorator::Resources::Deployment do
         decorator.run
         data = decorator.data
         name = data['spec']['template']['spec']['volumes'][0]['configMap']['name']
-        expect(name).to eq("demo-config-map-fakehash")
+        expect(name).to eq("demo-config-map-fakehash-config")
       end
     end
 
@@ -85,7 +88,50 @@ describe Kubes::Compiler::Decorator::Resources::Deployment do
       it "data" do
         decorator.run
         name = data['spec']['template']['spec']['containers'][0]['envFrom'][0]['configMapRef']['name']
-        expect(name).to eq("demo-config-map-fakehash")
+        expect(name).to eq("demo-config-map-fakehash-config")
+      end
+    end
+  end
+
+  context "both" do
+    describe "envFrom" do
+      let(:data) { fixture("both/envFrom") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        envFrom = data['spec']['template']['spec']['containers'][0]['envFrom']
+        name = envFrom[0]['secretRef']['name']
+        expect(name).to eq("demo-secret-fakehash")
+        name = envFrom[1]['configMapRef']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+        name = envFrom[2]['configMapRef']['name']
+        expect(name).to eq("demo-config-map-2-fakehash-config2")
+      end
+    end
+
+    describe "valueFrom" do
+      let(:data) { fixture("both/valueFrom") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        valueFrom = data['spec']['template']['spec']['containers'][0]['env'][0]['valueFrom']
+        name = valueFrom['configMapKeyRef']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+        name = valueFrom['secretKeyRef']['name']
+        expect(name).to eq("demo-secret-fakehash")
+      end
+    end
+
+    describe "volumes" do
+      let(:data) { fixture("both/volumes") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        volumes = data['spec']['template']['spec']['volumes']
+        name = volumes[0]['configMap']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+        name = volumes[1]['secret']['secretName']
+        expect(name).to eq("demo-secret-fakehash")
       end
     end
   end