Merge pull request #13765 from hakman/remove_legacy_addons

Remove some unused legacy addons

upup/models/cloudup/resources/addons/core.addons.k8s.io/addon.yaml

@@ -1,10 +0,0 @@
-kind: Addons
-metadata:
-  name: core
-spec:
-  addons:
-  - version: 1.4.0
-    selector:
-      k8s-addon: core.addons.k8s.io
-    manifest: v1.4.0.yaml
-

upup/models/cloudup/resources/addons/core.addons.k8s.io/k8s-1.12.yaml.template

@@ -1,154 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  annotations:
-    rbac.authorization.kubernetes.io/autoupdate: "true"
-  labels:
-    kubernetes.io/bootstrapping: rbac-defaults
-  name: system:cloud-controller-manager
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - '*'
-- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - create
-  - get
-  - list
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-  - list
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - list
-
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: cloud-controller-manager
-  namespace: kube-system
-
----
-
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: system:cloud-controller-manager
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:cloud-controller-manager
-subjects:
-- kind: ServiceAccount
-  name: cloud-controller-manager
-  namespace: kube-system
-
----
-
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  labels:
-    k8s-app: cloud-controller-manager
-  name: cloud-controller-manager
-  namespace: kube-system
-spec:
-  selector:
-    matchLabels:
-      k8s-app: cloud-controller-manager
-  template:
-    metadata:
-      labels:
-        k8s-app: cloud-controller-manager
-    spec:
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
-      priorityClassName: system-node-critical
-      serviceAccountName: cloud-controller-manager
-      containers:
-      - name: cloud-controller-manager
-        # for in-tree providers we use registry.k8s.io/cloud-controller-manager
-        # this can be replaced with any other image for out-of-tree providers
-        image: registry.k8s.io/cloud-controller-manager:v{{ .KubernetesVersion }}  # Reviewers: Will this work?
-        command:
-        - /usr/local/bin/cloud-controller-manager
-        - --cloud-provider={{ GetCloudProvider }}
-        - --leader-elect=true
-        - --use-service-account-credentials
-        # these flags will vary for every cloud provider
-        - --allocate-node-cidrs=true
-        - --configure-cloud-routes=true
-        - --cluster-cidr={{ .KubeControllerManager.ClusterCIDR }}
-        volumeMounts:
-        - name: ca-certificates
-          mountPath: /etc/ssl/certs
-      hostNetwork: true
-      dnsPolicy: Default
-      volumes:
-      - name: ca-certificates
-        hostPath:
-          path: /etc/ssl/certs
-      tolerations:
-      # this is required so CCM can bootstrap itself
-      - key: node.cloudprovider.kubernetes.io/uninitialized
-        value: "true"
-        effect: NoSchedule
-      # this is to have the daemonset runnable on master nodes
-      # the taint may vary depending on your cluster setup
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
-      # this is to restrict CCM to only run on master nodes
-      # the node selector may vary depending on your cluster setup
-      - key: "CriticalAddonsOnly"
-        operator: "Exists"
-

upup/models/cloudup/resources/addons/limit-range.addons.k8s.io/addon.yaml

@@ -1,9 +0,0 @@
-kind: Addons
-metadata:
-  name: limit-range
-spec:
-  addons:
-  - version: 1.5.0
-    selector:
-      k8s-addon: limit-range.addons.k8s.io
-    manifest: v1.5.0.yaml

upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/addon.yaml

@@ -1,10 +0,0 @@
-kind: Addons
-metadata:
-  name: metadata-proxy
-spec:
-  addons:
-  - version: 0.1.12
-    selector:
-      k8s-addon: metadata-proxy.addons.k8s.io
-    manifest: v0.12.yaml
-

upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go

@@ -1084,20 +1084,6 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*Addon
 					Id:       id,
 				})
 			}
-		} else {
-			{
-				key := "core.addons.k8s.io"
-
-				location := key + "/k8s-1.12.yaml"
-				id := "k8s-1.12-ccm"
-
-				addons.Add(&channelsapi.AddonSpec{
-					Name:     fi.String(key),
-					Selector: map[string]string{"k8s-addon": key},
-					Manifest: fi.String(location),
-					Id:       id,
-				})
-			}
 		}
 	}