From 8222ce55bfcbeb77f602a31b93115941681c2a29 Mon Sep 17 00:00:00 2001 From: Dmitry Ukov Date: Wed, 1 Apr 2020 13:28:27 +0400 Subject: [PATCH] Removed old v1alpha2 version of CAPI componets Change-Id: Ie4a3296df8b89b28b43f41b4b00e6abfde32675c --- .../baremetal-provider/kustomization.yaml | 13 --- .../baremetal-provider/namespace.yaml | 4 - .../function/baremetal-provider/provider.yaml | 108 ------------------ .../rbac/capbm-leader-election-role.yaml | 32 ------ .../capbm-leader-election-rolebinding.yaml | 12 -- .../rbac/capbm-manager-role.yaml | 108 ------------------ .../rbac/capbm-manager-rolebinding.yaml | 14 --- .../rbac/capbm-proxy-role.yaml | 20 ---- .../rbac/capbm-proxy-rolebinding.yaml | 14 --- .../rbac/kustomization.yaml | 7 -- .../function/cluster-api/kustomization.yaml | 14 --- .../function/cluster-api/patch_namespace.yaml | 3 - manifests/function/kubeadm/kustomization.yaml | 13 --- manifests/function/kubeadm/namespace.yaml | 4 - manifests/function/kubeadm/provider.yaml | 58 ---------- .../rbac/cabpk-leader-election-role.yaml | 26 ----- .../cabpk-leader-election-rolebinding.yaml | 12 -- .../kubeadm/rbac/cabpk-manager-role.yaml | 45 -------- .../rbac/cabpk-manager-rolebinding.yaml | 12 -- .../kubeadm/rbac/cabpk-proxy-role.yaml | 18 --- .../kubeadm/rbac/cabpk-proxy-rolebinding.yaml | 12 -- .../function/kubeadm/rbac/kustomization.yaml | 7 -- 22 files changed, 556 deletions(-) delete mode 100644 manifests/function/baremetal-provider/kustomization.yaml delete mode 100644 manifests/function/baremetal-provider/namespace.yaml delete mode 100644 manifests/function/baremetal-provider/provider.yaml delete mode 100644 manifests/function/baremetal-provider/rbac/capbm-leader-election-role.yaml delete mode 100644 manifests/function/baremetal-provider/rbac/capbm-leader-election-rolebinding.yaml delete mode 100644 manifests/function/baremetal-provider/rbac/capbm-manager-role.yaml delete mode 100644 manifests/function/baremetal-provider/rbac/capbm-manager-rolebinding.yaml delete mode 100644 manifests/function/baremetal-provider/rbac/capbm-proxy-role.yaml delete mode 100644 manifests/function/baremetal-provider/rbac/capbm-proxy-rolebinding.yaml delete mode 100644 manifests/function/baremetal-provider/rbac/kustomization.yaml delete mode 100644 manifests/function/cluster-api/kustomization.yaml delete mode 100644 manifests/function/cluster-api/patch_namespace.yaml delete mode 100644 manifests/function/kubeadm/kustomization.yaml delete mode 100644 manifests/function/kubeadm/namespace.yaml delete mode 100644 manifests/function/kubeadm/provider.yaml delete mode 100644 manifests/function/kubeadm/rbac/cabpk-leader-election-role.yaml delete mode 100644 manifests/function/kubeadm/rbac/cabpk-leader-election-rolebinding.yaml delete mode 100644 manifests/function/kubeadm/rbac/cabpk-manager-role.yaml delete mode 100644 manifests/function/kubeadm/rbac/cabpk-manager-rolebinding.yaml delete mode 100644 manifests/function/kubeadm/rbac/cabpk-proxy-role.yaml delete mode 100644 manifests/function/kubeadm/rbac/cabpk-proxy-rolebinding.yaml delete mode 100644 manifests/function/kubeadm/rbac/kustomization.yaml diff --git a/manifests/function/baremetal-provider/kustomization.yaml b/manifests/function/baremetal-provider/kustomization.yaml deleted file mode 100644 index bc491f2a1..000000000 --- a/manifests/function/baremetal-provider/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -resources: - - ../../global/crd/baremetal-provider - - rbac - - provider.yaml - - namespace.yaml - -commonLabels: - # NOTE We can't use airshipit.org/clustertype - # bacause a label can't consists of multiple values - airshipit.org/ephemeral: "true" - airshipit.org/target: "true" - -namespace: capbm diff --git a/manifests/function/baremetal-provider/namespace.yaml b/manifests/function/baremetal-provider/namespace.yaml deleted file mode 100644 index d10c4650b..000000000 --- a/manifests/function/baremetal-provider/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: capbm diff --git a/manifests/function/baremetal-provider/provider.yaml b/manifests/function/baremetal-provider/provider.yaml deleted file mode 100644 index 4df0e5fb0..000000000 --- a/manifests/function/baremetal-provider/provider.yaml +++ /dev/null @@ -1,108 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: capbm-webhook-server-secret ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - prometheus.io/port: "8443" - prometheus.io/scheme: https - prometheus.io/scrape: "true" - labels: - control-plane: controller-manager - controller-tools.k8s.io: "1.0" - name: capbm-controller-manager-metrics-svc -spec: - ports: - - name: https - port: 8443 - targetPort: https - selector: - control-plane: controller-manager - controller-tools.k8s.io: "1.0" - ---- -apiVersion: v1 -kind: Service -metadata: - labels: - control-plane: controller-manager - controller-tools.k8s.io: "1.0" - name: capbm-controller-manager-service -spec: - ports: - - port: 443 - selector: - control-plane: controller-manager - controller-tools.k8s.io: "1.0" - ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - labels: - control-plane: controller-manager - controller-tools.k8s.io: "1.0" - name: capbm-controller-manager -spec: - selector: - matchLabels: - control-plane: controller-manager - controller-tools.k8s.io: "1.0" - serviceName: capbm-controller-manager-service - template: - metadata: - labels: - control-plane: controller-manager - controller-tools.k8s.io: "1.0" - spec: - containers: - - args: - - --secure-listen-address=0.0.0.0:8443 - - --upstream=http://127.0.0.1:8080/ - - --logtostderr=true - - --v=10 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0 - name: kube-rbac-proxy - ports: - - containerPort: 8443 - name: https - - args: - - --metrics-addr=127.0.0.1:8080 - - --enable-leader-election - command: - - /manager - env: - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: SECRET_NAME - value: capbm-webhook-server-secret - image: "quay.io/metal3-io/cluster-api-provider-baremetal:v1alpha2" - imagePullPolicy: Always - name: manager - ports: - - containerPort: 9876 - name: webhook-server - protocol: TCP - resources: - limits: - cpu: 100m - memory: 30Mi - requests: - cpu: 100m - memory: 20Mi - volumeMounts: - - mountPath: /tmp/cert - name: cert - readOnly: true - terminationGracePeriodSeconds: 10 - volumes: - - name: cert - secret: - defaultMode: 420 - secretName: capbm-webhook-server-secret diff --git a/manifests/function/baremetal-provider/rbac/capbm-leader-election-role.yaml b/manifests/function/baremetal-provider/rbac/capbm-leader-election-role.yaml deleted file mode 100644 index e911e9541..000000000 --- a/manifests/function/baremetal-provider/rbac/capbm-leader-election-role.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: capbm-leader-election-role -rules: -- apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - "" - resources: - - configmaps/status - verbs: - - get - - update - - patch -- apiGroups: - - "" - resources: - - events - verbs: - - create diff --git a/manifests/function/baremetal-provider/rbac/capbm-leader-election-rolebinding.yaml b/manifests/function/baremetal-provider/rbac/capbm-leader-election-rolebinding.yaml deleted file mode 100644 index 57f686a61..000000000 --- a/manifests/function/baremetal-provider/rbac/capbm-leader-election-rolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: capbm-leader-election-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: capbm-leader-election-role -subjects: -- kind: ServiceAccount - name: default diff --git a/manifests/function/baremetal-provider/rbac/capbm-manager-role.yaml b/manifests/function/baremetal-provider/rbac/capbm-manager-role.yaml deleted file mode 100644 index 9cd151598..000000000 --- a/manifests/function/baremetal-provider/rbac/capbm-manager-role.yaml +++ /dev/null @@ -1,108 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - creationTimestamp: null - name: capbm-manager-role -rules: -- apiGroups: - - "" - resources: - - events - verbs: - - create - - get - - list - - patch - - update - - watch -- apiGroups: - - "" - resources: - - secrets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - - clusters - - clusters/status - verbs: - - get - - list - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - - machines - - machines/status - verbs: - - get - - list - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - baremetalclusters - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - baremetalclusters/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - baremetalmachines - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - baremetalmachines/status - verbs: - - get - - patch - - update -- apiGroups: - - metal3.io - resources: - - baremetalhosts - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - metal3.io - resources: - - baremetalhosts/status - verbs: - - get - - patch - - update diff --git a/manifests/function/baremetal-provider/rbac/capbm-manager-rolebinding.yaml b/manifests/function/baremetal-provider/rbac/capbm-manager-rolebinding.yaml deleted file mode 100644 index 8b16b65b6..000000000 --- a/manifests/function/baremetal-provider/rbac/capbm-manager-rolebinding.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - labels: - control-plane: capbm-controller-manager - name: capbm-manager-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: capbm-manager-role -subjects: -- kind: ServiceAccount - name: default diff --git a/manifests/function/baremetal-provider/rbac/capbm-proxy-role.yaml b/manifests/function/baremetal-provider/rbac/capbm-proxy-role.yaml deleted file mode 100644 index 0c2c9a471..000000000 --- a/manifests/function/baremetal-provider/rbac/capbm-proxy-role.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: - control-plane: capbm-controller-manager - name: capbm-proxy-role -rules: -- apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create -- apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create diff --git a/manifests/function/baremetal-provider/rbac/capbm-proxy-rolebinding.yaml b/manifests/function/baremetal-provider/rbac/capbm-proxy-rolebinding.yaml deleted file mode 100644 index 391efe811..000000000 --- a/manifests/function/baremetal-provider/rbac/capbm-proxy-rolebinding.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - labels: - control-plane: capbm-controller-manager - name: capbm-proxy-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: capbm-proxy-role -subjects: -- kind: ServiceAccount - name: default diff --git a/manifests/function/baremetal-provider/rbac/kustomization.yaml b/manifests/function/baremetal-provider/rbac/kustomization.yaml deleted file mode 100644 index cd533af2a..000000000 --- a/manifests/function/baremetal-provider/rbac/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -resources: - - capbm-leader-election-rolebinding.yaml - - capbm-leader-election-role.yaml - - capbm-manager-rolebinding.yaml - - capbm-manager-role.yaml - - capbm-proxy-rolebinding.yaml - - capbm-proxy-role.yaml diff --git a/manifests/function/cluster-api/kustomization.yaml b/manifests/function/cluster-api/kustomization.yaml deleted file mode 100644 index b4fafc752..000000000 --- a/manifests/function/cluster-api/kustomization.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- ../../global/crd/cluster-api -- https://github.com/kubernetes-sigs/cluster-api/config/default/?ref=v0.3.2 - -namePrefix: capi- - -patchesJson6902: -- target: - version: v1 - kind: Namespace - name: system - path: patch_namespace.yaml diff --git a/manifests/function/cluster-api/patch_namespace.yaml b/manifests/function/cluster-api/patch_namespace.yaml deleted file mode 100644 index 2f7008f35..000000000 --- a/manifests/function/cluster-api/patch_namespace.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: "/metadata/name" - value: capi-system diff --git a/manifests/function/kubeadm/kustomization.yaml b/manifests/function/kubeadm/kustomization.yaml deleted file mode 100644 index 3ef7f43e2..000000000 --- a/manifests/function/kubeadm/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -resources: - - ../../global/crd/kubeadm - - rbac - - provider.yaml - - namespace.yaml - -commonLabels: - # NOTE We can't use airshipit.org/clustertype - # bacause a label can't consists of multiple values - airshipit.org/ephemeral: "true" - airshipit.org/target: "true" - -namespace: capbk diff --git a/manifests/function/kubeadm/namespace.yaml b/manifests/function/kubeadm/namespace.yaml deleted file mode 100644 index 09cdd80d3..000000000 --- a/manifests/function/kubeadm/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: capbk diff --git a/manifests/function/kubeadm/provider.yaml b/manifests/function/kubeadm/provider.yaml deleted file mode 100644 index cba0a9635..000000000 --- a/manifests/function/kubeadm/provider.yaml +++ /dev/null @@ -1,58 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - prometheus.io/port: "8443" - prometheus.io/scheme: https - prometheus.io/scrape: "true" - labels: - control-plane: cabpk-controller-manager - name: cabpk-controller-manager-metrics-service -spec: - ports: - - name: https - port: 8443 - targetPort: https - selector: - control-plane: cabpk-controller-manager ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - control-plane: cabpk-controller-manager - name: cabpk-controller-manager -spec: - replicas: 1 - selector: - matchLabels: - control-plane: cabpk-controller-manager - template: - metadata: - labels: - control-plane: cabpk-controller-manager - spec: - containers: - - args: - - --secure-listen-address=0.0.0.0:8443 - - --upstream=http://127.0.0.1:8080/ - - --logtostderr=true - - --v=10 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0 - imagePullPolicy: Always - name: kube-rbac-proxy - ports: - - containerPort: 8443 - name: https - - args: - - --metrics-addr=127.0.0.1:8080 - - --v=4 - - --enable-leader-election - image: gcr.io/k8s-staging-capi-kubeadm/cluster-api-kubeadm-controller:latest - imagePullPolicy: Always - name: manager - terminationGracePeriodSeconds: 10 - tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/master diff --git a/manifests/function/kubeadm/rbac/cabpk-leader-election-role.yaml b/manifests/function/kubeadm/rbac/cabpk-leader-election-role.yaml deleted file mode 100644 index 4dcf11dcc..000000000 --- a/manifests/function/kubeadm/rbac/cabpk-leader-election-role.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: cabpk-leader-election-role -rules: -- apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - "" - resources: - - configmaps/status - verbs: - - get - - update - - patch diff --git a/manifests/function/kubeadm/rbac/cabpk-leader-election-rolebinding.yaml b/manifests/function/kubeadm/rbac/cabpk-leader-election-rolebinding.yaml deleted file mode 100644 index b09b54fb0..000000000 --- a/manifests/function/kubeadm/rbac/cabpk-leader-election-rolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: cabpk-leader-election-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: cabpk-leader-election-role -subjects: -- kind: ServiceAccount - name: default diff --git a/manifests/function/kubeadm/rbac/cabpk-manager-role.yaml b/manifests/function/kubeadm/rbac/cabpk-manager-role.yaml deleted file mode 100644 index 1681e4592..000000000 --- a/manifests/function/kubeadm/rbac/cabpk-manager-role.yaml +++ /dev/null @@ -1,45 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - creationTimestamp: null - name: cabpk-manager-role -rules: -- apiGroups: - - "" - resources: - - configmaps - - events - - secrets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - bootstrap.cluster.x-k8s.io - resources: - - kubeadmconfigs - - kubeadmconfigs/status - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - - clusters - - clusters/status - - machines - - machines/status - verbs: - - get - - list - - watch diff --git a/manifests/function/kubeadm/rbac/cabpk-manager-rolebinding.yaml b/manifests/function/kubeadm/rbac/cabpk-manager-rolebinding.yaml deleted file mode 100644 index 68d476239..000000000 --- a/manifests/function/kubeadm/rbac/cabpk-manager-rolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: cabpk-manager-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cabpk-manager-role -subjects: -- kind: ServiceAccount - name: default diff --git a/manifests/function/kubeadm/rbac/cabpk-proxy-role.yaml b/manifests/function/kubeadm/rbac/cabpk-proxy-role.yaml deleted file mode 100644 index 68bf6784f..000000000 --- a/manifests/function/kubeadm/rbac/cabpk-proxy-role.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: cabpk-proxy-role -rules: -- apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create -- apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create diff --git a/manifests/function/kubeadm/rbac/cabpk-proxy-rolebinding.yaml b/manifests/function/kubeadm/rbac/cabpk-proxy-rolebinding.yaml deleted file mode 100644 index d89f36728..000000000 --- a/manifests/function/kubeadm/rbac/cabpk-proxy-rolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: cabpk-proxy-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cabpk-proxy-role -subjects: -- kind: ServiceAccount - name: default diff --git a/manifests/function/kubeadm/rbac/kustomization.yaml b/manifests/function/kubeadm/rbac/kustomization.yaml deleted file mode 100644 index 7c71481fa..000000000 --- a/manifests/function/kubeadm/rbac/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -resources: - - cabpk-leader-election-rolebinding.yaml - - cabpk-leader-election-role.yaml - - cabpk-manager-rolebinding.yaml - - cabpk-manager-role.yaml - - cabpk-proxy-rolebinding.yaml - - cabpk-proxy-role.yaml