Merge pull request #829 from laverya/use-kustomize-head

Use kustomize head, allowing the use of other list types

Gopkg.toml

@@ -89,7 +89,7 @@ ignored = [
 
 [[constraint]]
   name = "sigs.k8s.io/kustomize"
-  version = "2.0.1"
+  branch = "master"
 
 [[override]]
   name = "k8s.io/kubernetes"

integration/init/other-list-types/expected/.ship/state.json

@@ -0,0 +1,8 @@
+{
+  "v1": {
+    "config": {},
+    "releaseName": "ship",
+    "upstream": "https://github.com/replicatedhq/test-charts/tree/0e13bc2c19778b67f83f68c5e2886de0cd43d59f/other-list-types",
+    "contentSHA": "78ca09c481a6c8b2d507da0c171defab38aa33dc990b4034b5447d75f74b7fdf"
+  }
+}

integration/init/other-list-types/expected/base/configmapList.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMapList
+items:
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    name: winnie
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    name: notwinnie

integration/init/other-list-types/expected/base/kustomization.yaml

@@ -0,0 +1,6 @@
+kind: ""
+apiversion: ""
+resources:
+- configmapList.yaml
+- roleBindingList.yaml
+- roleList.yaml

integration/init/other-list-types/expected/base/roleBindingList.yaml

@@ -0,0 +1,18 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBindingList
+items:
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: RoleBinding
+  metadata:
+    name: rolebinding-prometheus
+    labels:
+      app: default-prometheus
+    namespace: default
+  roleRef:
+    apiGroup: rbac.authorization.k8s.io
+    kind: Role
+    name: role-prometheus
+  subjects:
+  - kind: ServiceAccount
+    name: role-prometheus
+    namespace: default

integration/init/other-list-types/expected/base/roleList.yaml

@@ -0,0 +1,22 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleList
+items:
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: Role
+  metadata:
+    name: role-prometheus
+    labels:
+      app: default-prometheus
+    namespace: default
+  rules:
+  - apiGroups:
+    - ""
+    resources:
+    - nodes
+    - services
+    - endpoints
+    - pods
+    verbs:
+    - get
+    - list
+    - watch

integration/init/other-list-types/expected/overlays/ship/kustomization.yaml

@@ -0,0 +1,4 @@
+kind: ""
+apiversion: ""
+bases:
+- ../../base

integration/init/other-list-types/expected/rendered.yaml

@@ -0,0 +1,45 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app: default-prometheus
+  name: role-prometheus
+  namespace: default
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  - services
+  - endpoints
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app: default-prometheus
+  name: rolebinding-prometheus
+  namespace: default
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: role-prometheus
+subjects:
+- kind: ServiceAccount
+  name: role-prometheus
+  namespace: default
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: notwinnie
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: winnie

integration/init/other-list-types/metadata.yaml

@@ -0,0 +1,3 @@
+upstream: "https://github.com/replicatedhq/test-charts/tree/0e13bc2c19778b67f83f68c5e2886de0cd43d59f/other-list-types"
+args: ["--prefer-git"]
+skip_cleanup: false

pkg/patch/kustomize.go

@@ -36,7 +36,7 @@ func (p *ShipPatcher) runKustomize(out io.Writer, fSys fs.FileSystem, kustomizat
 
 	k8sFactory := k8sdeps.NewFactory()
 
-	kt, err := target.NewKustTarget(ldr, fSys, k8sFactory.ResmapF, k8sFactory.TransformerF)
+	kt, err := target.NewKustTarget(ldr, k8sFactory.ResmapF, k8sFactory.TransformerF)
 	if err != nil {
 		return errors.Wrap(err, "make customized kustomize target")
 	}