From 5e622354031b8c87f0dc939ee9f16e113362453e Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Mon, 24 May 2021 08:25:58 -0700
Subject: [PATCH] Remove unused files

---
 ...orking.amazon-vpc-routed-eni-k8s-1.12.yaml | 189 ------------------
 ...orking.amazon-vpc-routed-eni-k8s-1.12.yaml | 189 ------------------
 ...dns-controller.addons.k8s.io-k8s-1.12.yaml | 125 ------------
 ...onymous-access.addons.k8s.io-k8s-1.16.yaml |  15 --
 .../bootstrapchannelbuilder/jwks/cluster.yaml |  42 ----
 ...dns-controller.addons.k8s.io-k8s-1.12.yaml | 128 ------------
 ...ops-controller.addons.k8s.io-k8s-1.16.yaml | 175 ----------------
 .../jwks/manifest.yaml                        |  96 ---------
 ...dns-controller.addons.k8s.io-k8s-1.12.yaml | 125 ------------
 9 files changed, 1084 deletions(-)
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.12.yaml
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.12.yaml
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/anonymous-access.addons.k8s.io-k8s-1.16.yaml
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/cluster.yaml
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml
 delete mode 100644 upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.12.yaml
deleted file mode 100644
index f3c1302262..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.12.yaml
+++ /dev/null
@@ -1,189 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    role.kubernetes.io/networking: "1"
-  name: aws-node
-rules:
-- apiGroups:
-  - crd.k8s.amazonaws.com
-  resources:
-  - '*'
-  - namespaces
-  verbs:
-  - '*'
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  - nodes
-  - namespaces
-  verbs:
-  - list
-  - watch
-  - get
-- apiGroups:
-  - extensions
-  resources:
-  - daemonsets
-  verbs:
-  - list
-  - watch
-
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    role.kubernetes.io/networking: "1"
-  name: aws-node
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    role.kubernetes.io/networking: "1"
-  name: aws-node
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: aws-node
-subjects:
-- kind: ServiceAccount
-  name: aws-node
-  namespace: kube-system
-
----
-
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    k8s-app: aws-node
-    role.kubernetes.io/networking: "1"
-  name: aws-node
-  namespace: kube-system
-spec:
-  selector:
-    matchLabels:
-      k8s-app: aws-node
-  template:
-    metadata:
-      labels:
-        k8s-app: aws-node
-    spec:
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: beta.kubernetes.io/os
-                operator: In
-                values:
-                - linux
-              - key: beta.kubernetes.io/arch
-                operator: In
-                values:
-                - amd64
-      containers:
-      - env:
-        - name: CLUSTER_NAME
-          value: minimal.example.com
-        - name: AWS_VPC_K8S_CNI_LOGLEVEL
-          value: DEBUG
-        - name: MY_NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        - name: WATCH_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: WARM_IP_TARGET
-          value: "10"
-        - name: AWS_VPC_K8S_CNI_LOGLEVEL
-          value: debug
-        image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.5
-        imagePullPolicy: Always
-        name: aws-node
-        ports:
-        - containerPort: 61678
-          name: metrics
-        resources:
-          requests:
-            cpu: 10m
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /host/opt/cni/bin
-          name: cni-bin-dir
-        - mountPath: /host/etc/cni/net.d
-          name: cni-net-dir
-        - mountPath: /host/var/log
-          name: log-dir
-        - mountPath: /var/run/docker.sock
-          name: dockersock
-      hostNetwork: true
-      priorityClassName: system-node-critical
-      serviceAccountName: aws-node
-      tolerations:
-      - operator: Exists
-      volumes:
-      - hostPath:
-          path: /opt/cni/bin
-        name: cni-bin-dir
-      - hostPath:
-          path: /etc/cni/net.d
-        name: cni-net-dir
-      - hostPath:
-          path: /var/log
-        name: log-dir
-      - hostPath:
-          path: /var/run/docker.sock
-        name: dockersock
-  updateStrategy:
-    type: RollingUpdate
-
----
-
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    role.kubernetes.io/networking: "1"
-  name: eniconfigs.crd.k8s.amazonaws.com
-spec:
-  group: crd.k8s.amazonaws.com
-  names:
-    kind: ENIConfig
-    plural: eniconfigs
-    singular: eniconfig
-  scope: Cluster
-  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.12.yaml
deleted file mode 100644
index f3c1302262..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.12.yaml
+++ /dev/null
@@ -1,189 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    role.kubernetes.io/networking: "1"
-  name: aws-node
-rules:
-- apiGroups:
-  - crd.k8s.amazonaws.com
-  resources:
-  - '*'
-  - namespaces
-  verbs:
-  - '*'
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  - nodes
-  - namespaces
-  verbs:
-  - list
-  - watch
-  - get
-- apiGroups:
-  - extensions
-  resources:
-  - daemonsets
-  verbs:
-  - list
-  - watch
-
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    role.kubernetes.io/networking: "1"
-  name: aws-node
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    role.kubernetes.io/networking: "1"
-  name: aws-node
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: aws-node
-subjects:
-- kind: ServiceAccount
-  name: aws-node
-  namespace: kube-system
-
----
-
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    k8s-app: aws-node
-    role.kubernetes.io/networking: "1"
-  name: aws-node
-  namespace: kube-system
-spec:
-  selector:
-    matchLabels:
-      k8s-app: aws-node
-  template:
-    metadata:
-      labels:
-        k8s-app: aws-node
-    spec:
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: beta.kubernetes.io/os
-                operator: In
-                values:
-                - linux
-              - key: beta.kubernetes.io/arch
-                operator: In
-                values:
-                - amd64
-      containers:
-      - env:
-        - name: CLUSTER_NAME
-          value: minimal.example.com
-        - name: AWS_VPC_K8S_CNI_LOGLEVEL
-          value: DEBUG
-        - name: MY_NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        - name: WATCH_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: WARM_IP_TARGET
-          value: "10"
-        - name: AWS_VPC_K8S_CNI_LOGLEVEL
-          value: debug
-        image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.5
-        imagePullPolicy: Always
-        name: aws-node
-        ports:
-        - containerPort: 61678
-          name: metrics
-        resources:
-          requests:
-            cpu: 10m
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /host/opt/cni/bin
-          name: cni-bin-dir
-        - mountPath: /host/etc/cni/net.d
-          name: cni-net-dir
-        - mountPath: /host/var/log
-          name: log-dir
-        - mountPath: /var/run/docker.sock
-          name: dockersock
-      hostNetwork: true
-      priorityClassName: system-node-critical
-      serviceAccountName: aws-node
-      tolerations:
-      - operator: Exists
-      volumes:
-      - hostPath:
-          path: /opt/cni/bin
-        name: cni-bin-dir
-      - hostPath:
-          path: /etc/cni/net.d
-        name: cni-net-dir
-      - hostPath:
-          path: /var/log
-        name: log-dir
-      - hostPath:
-          path: /var/run/docker.sock
-        name: dockersock
-  updateStrategy:
-    type: RollingUpdate
-
----
-
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: networking.amazon-vpc-routed-eni
-    addon.kops.k8s.io/version: 1.5.5-kops.1
-    app.kubernetes.io/managed-by: kops
-    role.kubernetes.io/networking: "1"
-  name: eniconfigs.crd.k8s.amazonaws.com
-spec:
-  group: crd.k8s.amazonaws.com
-  names:
-    kind: ENIConfig
-    plural: eniconfigs
-    singular: eniconfig
-  scope: Cluster
-  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
deleted file mode 100644
index 99d5e34829..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: dns-controller.addons.k8s.io
-    addon.kops.k8s.io/version: 1.22.0-alpha.1
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: dns-controller.addons.k8s.io
-    k8s-app: dns-controller
-    version: v1.22.0-alpha.1
-  name: dns-controller
-  namespace: kube-system
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      k8s-app: dns-controller
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
-      labels:
-        k8s-addon: dns-controller.addons.k8s.io
-        k8s-app: dns-controller
-        version: v1.22.0-alpha.1
-    spec:
-      containers:
-      - command:
-        - /dns-controller
-        - --watch-ingress=false
-        - --dns=aws-route53
-        - --zone=*/Z1AFAKE1ZON3YO
-        - --zone=*/*
-        - -v=2
-        env:
-        - name: KUBERNETES_SERVICE_HOST
-          value: 127.0.0.1
-        image: k8s.gcr.io/kops/dns-controller:1.22.0-alpha.1
-        name: dns-controller
-        resources:
-          requests:
-            cpu: 50m
-            memory: 50Mi
-        securityContext:
-          runAsNonRoot: true
-      dnsPolicy: Default
-      hostNetwork: true
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
-      priorityClassName: system-cluster-critical
-      serviceAccount: dns-controller
-      tolerations:
-      - operator: Exists
-
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: dns-controller.addons.k8s.io
-    addon.kops.k8s.io/version: 1.22.0-alpha.1
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: dns-controller.addons.k8s.io
-  name: dns-controller
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: dns-controller.addons.k8s.io
-    addon.kops.k8s.io/version: 1.22.0-alpha.1
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: dns-controller.addons.k8s.io
-  name: kops:dns-controller
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  - services
-  - pods
-  - ingress
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - extensions
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: dns-controller.addons.k8s.io
-    addon.kops.k8s.io/version: 1.22.0-alpha.1
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: dns-controller.addons.k8s.io
-  name: kops:dns-controller
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kops:dns-controller
-subjects:
-- apiGroup: rbac.authorization.k8s.io
-  kind: User
-  name: system:serviceaccount:kube-system:dns-controller
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/anonymous-access.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/anonymous-access.addons.k8s.io-k8s-1.16.yaml
deleted file mode 100644
index 01d2200b2e..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/anonymous-access.addons.k8s.io-k8s-1.16.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    k8s-addon: anonymous-access.addons.k8s.io
-  name: anonymous:service-account-issuer-discovery
-  namespace: kube-system
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:service-account-issuer-discovery
-subjects:
-- apiGroup: rbac.authorization.k8s.io
-  kind: User
-  name: system:anonymous
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/cluster.yaml
deleted file mode 100644
index 91d03333db..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/cluster.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: Cluster
-metadata:
-  creationTimestamp: "2016-12-10T22:42:27Z"
-  name: minimal.example.com
-spec:
-  addons:
-    - manifest: s3://somebucket/example.yaml
-  kubernetesApiAccess:
-  - 0.0.0.0/0
-  channel: stable
-  cloudProvider: aws
-  configBase: memfs://clusters.example.com/minimal.example.com
-  etcdClusters:
-  - etcdMembers:
-    - instanceGroup: master-us-test-1a
-      name: master-us-test-1a
-    name: main
-  - etcdMembers:
-    - instanceGroup: master-us-test-1a
-      name: master-us-test-1a
-    name: events
-  iam: {}
-  kubernetesVersion: v1.14.6
-  masterInternalName: api.internal.minimal.example.com
-  masterPublicName: api.minimal.example.com
-  additionalSans:
-  - proxy.api.minimal.example.com
-  networkCIDR: 172.20.0.0/16
-  networking:
-    kubenet: {}
-  nonMasqueradeCIDR: 100.64.0.0/10
-  sshAccess:
-    - 0.0.0.0/0
-  topology:
-    masters: public
-    nodes: public
-  subnets:
-  - cidr: 172.20.32.0/19
-    name: us-test-1a
-    type: Public
-    zone: us-test-1a
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml
deleted file mode 100644
index 255e5fa921..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml
+++ /dev/null
@@ -1,128 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    k8s-addon: dns-controller.addons.k8s.io
-    k8s-app: dns-controller
-    version: v1.19.0-alpha.2
-  name: dns-controller
-  namespace: kube-system
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      k8s-app: dns-controller
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
-      labels:
-        k8s-addon: dns-controller.addons.k8s.io
-        k8s-app: dns-controller
-        version: v1.19.0-alpha.2
-    spec:
-      containers:
-      - command:
-        - /dns-controller
-        - --watch-ingress=false
-        - --dns=aws-route53
-        - --zone=*/Z1AFAKE1ZON3YO
-        - --zone=*/*
-        - -v=2
-        env:
-        - name: KUBERNETES_SERVICE_HOST
-          value: 127.0.0.1
-        - name: AWS_ROLE_ARN
-          value: arn:aws:iam:::role/dns-controller.kube-system.sa.minimal.example.com
-        - name: AWS_WEB_IDENTITY_TOKEN_FILE
-          value: /var/run/secrets/amazonaws.com/token
-        image: kope/dns-controller:1.19.0-alpha.2
-        name: dns-controller
-        resources:
-          requests:
-            cpu: 50m
-            memory: 50Mi
-        securityContext:
-          runAsNonRoot: true
-        volumeMounts:
-        - mountPath: /var/run/secrets/amazonaws.com/
-          name: token-amazonaws-com
-          readOnly: true
-      dnsPolicy: Default
-      hostNetwork: true
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
-      priorityClassName: system-cluster-critical
-      securityContext:
-        fsGroup: 10001
-      serviceAccount: dns-controller
-      tolerations:
-      - operator: Exists
-      volumes:
-      - name: token-amazonaws-com
-        projected:
-          defaultMode: 420
-          sources:
-          - serviceAccountToken:
-              audience: amazonaws.com
-              expirationSeconds: 86400
-              path: token
-
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    k8s-addon: dns-controller.addons.k8s.io
-  name: dns-controller
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    k8s-addon: dns-controller.addons.k8s.io
-  name: kops:dns-controller
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  - services
-  - pods
-  - ingress
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - extensions
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    k8s-addon: dns-controller.addons.k8s.io
-  name: kops:dns-controller
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kops:dns-controller
-subjects:
-- apiGroup: rbac.authorization.k8s.io
-  kind: User
-  name: system:serviceaccount:kube-system:dns-controller
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml
deleted file mode 100644
index cd2920e40e..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml
+++ /dev/null
@@ -1,175 +0,0 @@
-apiVersion: v1
-data:
-  config.yaml: |
-    {"cloud":"aws","configBase":"memfs://clusters.example.com/minimal.example.com"}
-kind: ConfigMap
-metadata:
-  labels:
-    k8s-addon: kops-controller.addons.k8s.io
-  name: kops-controller
-  namespace: kube-system
-
----
-
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  labels:
-    k8s-addon: kops-controller.addons.k8s.io
-    k8s-app: kops-controller
-    version: v1.19.0-alpha.2
-  name: kops-controller
-  namespace: kube-system
-spec:
-  selector:
-    matchLabels:
-      k8s-app: kops-controller
-  template:
-    metadata:
-      labels:
-        k8s-addon: kops-controller.addons.k8s.io
-        k8s-app: kops-controller
-        version: v1.19.0-alpha.2
-    spec:
-      containers:
-      - command:
-        - /kops-controller
-        - --v=2
-        - --conf=/etc/kubernetes/kops-controller/config/config.yaml
-        image: kope/kops-controller:1.19.0-alpha.2
-        name: kops-controller
-        resources:
-          requests:
-            cpu: 50m
-            memory: 50Mi
-        securityContext:
-          runAsNonRoot: true
-        volumeMounts:
-        - mountPath: /etc/kubernetes/kops-controller/config/
-          name: kops-controller-config
-        - mountPath: /etc/kubernetes/kops-controller/pki/
-          name: kops-controller-pki
-      dnsPolicy: Default
-      hostNetwork: true
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
-      priorityClassName: system-node-critical
-      serviceAccount: kops-controller
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-      volumes:
-      - configMap:
-          name: kops-controller
-        name: kops-controller-config
-      - hostPath:
-          path: /etc/kubernetes/kops-controller/
-          type: Directory
-        name: kops-controller-pki
-  updateStrategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
-
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    k8s-addon: kops-controller.addons.k8s.io
-  name: kops-controller
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    k8s-addon: kops-controller.addons.k8s.io
-  name: kops-controller
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    k8s-addon: kops-controller.addons.k8s.io
-  name: kops-controller
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kops-controller
-subjects:
-- apiGroup: rbac.authorization.k8s.io
-  kind: User
-  name: system:serviceaccount:kube-system:kops-controller
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  labels:
-    k8s-addon: kops-controller.addons.k8s.io
-  name: kops-controller
-  namespace: kube-system
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-- apiGroups:
-  - ""
-  resourceNames:
-  - kops-controller-leader
-  resources:
-  - configmaps
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - create
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    k8s-addon: kops-controller.addons.k8s.io
-  name: kops-controller
-  namespace: kube-system
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: kops-controller
-subjects:
-- apiGroup: rbac.authorization.k8s.io
-  kind: User
-  name: system:serviceaccount:kube-system:kops-controller
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml
deleted file mode 100644
index 328f79b280..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-kind: Addons
-metadata:
-  creationTimestamp: null
-  name: bootstrap
-spec:
-  addons:
-  - id: k8s-1.16
-    kubernetesVersion: '>=1.16.0-alpha.0'
-    manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 7a7039ba3b0e9c0027e486902fba3c6d266cbb46
-    name: kops-controller.addons.k8s.io
-    selector:
-      k8s-addon: kops-controller.addons.k8s.io
-    version: 1.19.0-alpha.2
-  - id: k8s-1.16
-    kubernetesVersion: '>=1.16.0-alpha.0'
-    manifest: anonymous-access.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: d01bb2f3c12819e21bf0197624b95fb53dc0951a
-    name: anonymous-access.addons.k8s.io
-    selector:
-      k8s-addon: anonymous-access.addons.k8s.io
-    version: 1.22.0-alpha.1
-  - manifest: core.addons.k8s.io/v1.4.0.yaml
-    manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
-    name: core.addons.k8s.io
-    selector:
-      k8s-addon: core.addons.k8s.io
-    version: 1.4.0
-  - id: k8s-1.6
-    kubernetesVersion: <1.12.0
-    manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: 79dc1f02e5b03f6cfd06631bf26a9e4d3cb304f6
-    name: kube-dns.addons.k8s.io
-    selector:
-      k8s-addon: kube-dns.addons.k8s.io
-    version: 1.15.13-kops.3
-  - id: k8s-1.12
-    kubernetesVersion: '>=1.12.0'
-    manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: db49c98447b9d59dec4fa413461a6614bc6e43e9
-    name: kube-dns.addons.k8s.io
-    selector:
-      k8s-addon: kube-dns.addons.k8s.io
-    version: 1.15.13-kops.3
-  - id: k8s-1.8
-    manifest: rbac.addons.k8s.io/k8s-1.8.yaml
-    manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914
-    name: rbac.addons.k8s.io
-    selector:
-      k8s-addon: rbac.addons.k8s.io
-    version: 1.8.0
-  - id: k8s-1.9
-    manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml
-    manifestHash: e1508d77cb4e527d7a2939babe36dc350dd83745
-    name: kubelet-api.rbac.addons.k8s.io
-    selector:
-      k8s-addon: kubelet-api.rbac.addons.k8s.io
-    version: v0.0.1
-  - manifest: limit-range.addons.k8s.io/v1.5.0.yaml
-    manifestHash: 2ea50e23f1a5aa41df3724630ac25173738cc90c
-    name: limit-range.addons.k8s.io
-    selector:
-      k8s-addon: limit-range.addons.k8s.io
-    version: 1.5.0
-  - id: k8s-1.6
-    kubernetesVersion: <1.12.0
-    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120
-    name: dns-controller.addons.k8s.io
-    selector:
-      k8s-addon: dns-controller.addons.k8s.io
-    version: 1.19.0-alpha.2
-  - id: k8s-1.12
-    kubernetesVersion: '>=1.12.0'
-    manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 5769bc1b5dd586e79338a42402dded07a3771634
-    name: dns-controller.addons.k8s.io
-    selector:
-      k8s-addon: dns-controller.addons.k8s.io
-    version: 1.19.0-alpha.2
-  - id: v1.15.0
-    kubernetesVersion: '>=1.15.0'
-    manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
-    manifestHash: 00cf6e46e25b736b2da93c6025ce482474d83904
-    name: storage-aws.addons.k8s.io
-    selector:
-      k8s-addon: storage-aws.addons.k8s.io
-    version: 1.15.0
-  - id: v1.7.0
-    kubernetesVersion: <1.15.0
-    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
-    manifestHash: 62705a596142e6cc283280e8aa973e51536994c5
-    name: storage-aws.addons.k8s.io
-    selector:
-      k8s-addon: storage-aws.addons.k8s.io
-    version: 1.15.0
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
deleted file mode 100644
index 99d5e34829..0000000000
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: dns-controller.addons.k8s.io
-    addon.kops.k8s.io/version: 1.22.0-alpha.1
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: dns-controller.addons.k8s.io
-    k8s-app: dns-controller
-    version: v1.22.0-alpha.1
-  name: dns-controller
-  namespace: kube-system
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      k8s-app: dns-controller
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
-      labels:
-        k8s-addon: dns-controller.addons.k8s.io
-        k8s-app: dns-controller
-        version: v1.22.0-alpha.1
-    spec:
-      containers:
-      - command:
-        - /dns-controller
-        - --watch-ingress=false
-        - --dns=aws-route53
-        - --zone=*/Z1AFAKE1ZON3YO
-        - --zone=*/*
-        - -v=2
-        env:
-        - name: KUBERNETES_SERVICE_HOST
-          value: 127.0.0.1
-        image: k8s.gcr.io/kops/dns-controller:1.22.0-alpha.1
-        name: dns-controller
-        resources:
-          requests:
-            cpu: 50m
-            memory: 50Mi
-        securityContext:
-          runAsNonRoot: true
-      dnsPolicy: Default
-      hostNetwork: true
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
-      priorityClassName: system-cluster-critical
-      serviceAccount: dns-controller
-      tolerations:
-      - operator: Exists
-
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: dns-controller.addons.k8s.io
-    addon.kops.k8s.io/version: 1.22.0-alpha.1
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: dns-controller.addons.k8s.io
-  name: dns-controller
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: dns-controller.addons.k8s.io
-    addon.kops.k8s.io/version: 1.22.0-alpha.1
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: dns-controller.addons.k8s.io
-  name: kops:dns-controller
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  - services
-  - pods
-  - ingress
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - extensions
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: dns-controller.addons.k8s.io
-    addon.kops.k8s.io/version: 1.22.0-alpha.1
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: dns-controller.addons.k8s.io
-  name: kops:dns-controller
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kops:dns-controller
-subjects:
-- apiGroup: rbac.authorization.k8s.io
-  kind: User
-  name: system:serviceaccount:kube-system:dns-controller