diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 31cf5469550..00000000000 --- a/.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -generatedconfigs/ -.env -kubeconfig -minikube.kubeconfig -.travis.yml \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 73b6880b367..00000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: 'Bug report' -about: Tell us about a problem you are experiencing. - ---- - -/kind bug - -**What steps did you take and what happened:** -[A clear and concise description of what the bug is.] - - -**What did you expect to happen:** - - -**Anything else you would like to add:** -[Miscellaneous information that will assist in solving the issue.] - - -**Environment:** - -- cluster-api-provider-azure version: -- Kubernetes version: (use `kubectl version`): -- OS (e.g. from `/etc/os-release`): diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 90f1a38ec2d..00000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: 'Feature request' -about: Suggest an idea for this project. - ---- - -/kind feature - -**Describe the solution you'd like** -[A clear and concise description of what you want to happen.] - - -**Anything else you would like to add:** -[Miscellaneous information that will assist in solving the issue.] - - -**Environment:** - -- cluster-api-provider-azure version: -- Kubernetes version: (use `kubectl version`): -- OS (e.g. from `/etc/os-release`): diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 60774bed964..00000000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,17 +0,0 @@ -**What this PR does / why we need it**: - -**Which issue(s) this PR fixes** *(optional, in `fixes #(, fixes #, ...)` format, will close the issue(s) when PR gets merged)*: -Fixes # - -**Special notes for your reviewer**: - -_Please confirm that if this PR changes any image versions, then that's the sole change this PR makes._ - -**Release note**: - -```release-note - -``` \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 16fbeff96d5..00000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,25 +0,0 @@ -# Contributing Guidelines - -Welcome to Kubernetes. We are excited about the prospect of you joining our [community](https://github.com/kubernetes/community)! The Kubernetes community abides by the CNCF [code of conduct](code-of-conduct.md). Here is an excerpt: - -_As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities._ - -## Getting Started - -We have full documentation on how to get started contributing here: - - - -- [Contributor License Agreement](https://git.k8s.io/community/CLA.md) Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests -- [Kubernetes Contributor Guide](http://git.k8s.io/community/contributors/guide) - Main contributor documentation, or you can just jump directly to the [contributing section](http://git.k8s.io/community/contributors/guide#contributing) -- [Contributor Cheat Sheet](https://git.k8s.io/community/contributors/guide/contributor-cheatsheet.md) - Common resources for existing developers - -## Mentorship - -- [Mentoring Initiatives](https://git.k8s.io/community/mentoring) - We have a diverse set of mentorship programs available that are always looking for volunteers! - -## Contact Information - -- [Slack channel](https://kubernetes.slack.com/messages/cluster-api-azure) - [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle) diff --git a/Makefile b/Makefile index a5d9a1fbc3a..f1235f66619 100644 --- a/Makefile +++ b/Makefile @@ -68,9 +68,6 @@ endif help: ## Display this help @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) -verify: - ./hack/verify_boilerplate.py - .PHONY: vendor vendor: $(DOCKER_CMD) hack/go-mod.sh @@ -94,10 +91,6 @@ gogen: vet: $(DOCKER_CMD) go vet -composites=false ./pkg/... ./cmd/... -.PHONY: verify-boilerplate -verify-boilerplate: - ./hack/verify-boilerplate.sh - .PHONY: test-e2e test-e2e: hack/e2e.sh diff --git a/PROJECT b/PROJECT deleted file mode 100644 index 07c15a9e17f..00000000000 --- a/PROJECT +++ /dev/null @@ -1,3 +0,0 @@ -version: "1" -domain: k8s.io -repo: sigs.k8s.io/cluster-api-provider-azure diff --git a/SECURITY_CONTACTS b/SECURITY_CONTACTS deleted file mode 100644 index af65f899601..00000000000 --- a/SECURITY_CONTACTS +++ /dev/null @@ -1,16 +0,0 @@ -# Defined below are the security contacts for this repo. -# -# They are the contact point for the Product Security Team to reach out -# to for triaging and handling of incoming issues. -# -# The below names agree to abide by the -# [Embargo Policy](https://github.com/kubernetes/sig-release/blob/master/security-release-process-documentation/security-release-process.md#embargo-policy) -# and will be removed and replaced if they violate that agreement. -# -# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE -# INSTRUCTIONS AT https://kubernetes.io/security/ - -justaugustus -soggiest -tariq1890 -vannrt diff --git a/azure-role.json b/azure-role.json deleted file mode 100644 index a576a6db020..00000000000 --- a/azure-role.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "additionalProperties": {}, - "assignableScopes": [ - "/subscriptions/6648228a-736c-4a4e-9a14-92a7e5190f4a" - ], - "description": "Azure actuator role to manage Azure virtual instance through an azure actuator", - "id": "/subscriptions/6648228a-736c-4a4e-9a14-92a7e5190f4a/providers/Microsoft.Authorization/roleDefinitions/80262652-a4ff-43ab-89ae-add4c86fe207", - "name": "Azure Actuator", - "permissions": [ - { - "actions": [ - "Microsoft.Compute/disks/delete", - "Microsoft.Compute/virtualMachines/read", - "Microsoft.Network/virtualNetworks/subnets/read", - "Microsoft.Network/networkInterfaces/write", - "Microsoft.Network/virtualNetworks/subnets/join/action", - "Microsoft.Network/networkInterfaces/read", - "Microsoft.Compute/virtualMachines/write", - "Microsoft.Network/networkInterfaces/join/action", - "Microsoft.ManagedIdentity/userAssignedIdentities/assign/action", - "Microsoft.Compute/images/read", - "Microsoft.Network/publicIPAddresses/read", - "Microsoft.Network/publicIPAddresses/join/action", - "Microsoft.Network/publicIPAddresses/write", - - "Microsoft.Compute/virtualMachines/delete", - "Microsoft.Network/networkInterfaces/delete", - "Microsoft.Network/publicIPAddresses/delete", - ], - "additionalProperties": {}, - "dataActions": [], - "notActions": [], - "notDataActions": [] - } - ], - "roleName": "AzureActuator", - "roleType": "CustomRole", - "type": "Microsoft.Authorization/roleDefinitions" -} diff --git a/config/bootstrap.sh b/config/bootstrap.sh deleted file mode 100644 index f79cdc13c17..00000000000 --- a/config/bootstrap.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/bin/bash - -cat < /root/user-data.sh -#!/bin/bash - -################################################ -######## Install packages and binaries -################################################ - -cat < /etc/yum.repos.d/kubernetes.repo -[kubernetes] -name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 -enabled=1 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg -exclude=kube* -EOF - -setenforce 0 -yum install -y docker -systemctl enable docker -systemctl start docker -yum install -y kubelet-1.13.1 kubeadm-1.13.1 kubectl-1.13.1 kubernetes-cni-0.6.0-0 --disableexcludes=kubernetes - -cat < /etc/default/kubelet -KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=systemd -EOF - -echo '1' > /proc/sys/net/bridge/bridge-nf-call-iptables - -curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases/latest |\ - grep browser_download |\ - grep linux |\ - cut -d '"' -f 4 |\ - xargs curl -O -L -chmod u+x kustomize_*_linux_amd64 -sudo mv kustomize_*_linux_amd64 /usr/bin/kustomize - -sudo yum install -y git - -################################################ -######## Deploy kubernetes master -################################################ - -kubeadm init --apiserver-bind-port 8443 --token 2iqzqm.85bs0x6miyx1nm7l --apiserver-cert-extra-sans=$(curl icanhazip.com) --pod-network-cidr=192.168.0.0/16 -v 6 - -# Enable networking by default. -kubectl apply -f https://raw.githubusercontent.com/cloudnativelabs/kube-router/master/daemonset/kubeadm-kuberouter.yaml --kubeconfig /etc/kubernetes/admin.conf - -# Binaries expected under /opt/cni/bin are actually under /usr/libexec/cni -if [[ ! -e /opt/cni/bin ]]; then - mkdir -p /opt/cni/bin - cp /usr/libexec/cni/bridge /opt/cni/bin - cp /usr/libexec/cni/loopback /opt/cni/bin - cp /usr/libexec/cni/host-local /opt/cni/bin -fi - -mkdir -p /root/.kube -cp -i /etc/kubernetes/admin.conf /root/.kube/config -chown $(id -u):$(id -g) /root/.kube/config - -################################################ -######## Deploy machine-api plane -################################################ - -git clone https://github.com/openshift/cluster-api-provider-azure.git -cd cluster-api-provider-azure - -cat < secret.yaml -apiVersion: v1 -kind: Secret -metadata: - name: test - namespace: default -type: Opaque -data: - azure_client_id: FILLIN - azure_client_secret: FILLIN - azure_region: ZWFzdHVzMg== - azure_resource_prefix: b3M0LWNvbW1vbg== - azure_resourcegroup: b3M0LWNvbW1vbg== - azure_subscription_id: FILLIN - azure_tenant_id: FILLIN -EOF - -sudo kubectl apply -f secret.yaml - -kustomize build config | sudo kubectl apply -f - - -kubectl apply -f config/master-user-data-secret.yaml -kubectl apply -f config/master-machine.yaml - -################################################ -######## generate worker machineset user data -################################################ - -cat < /root/workerset-user-data.sh -#!/bin/bash - -cat < /root/workerset-user-data.sh -#!/bin/bash - -cat < /etc/yum.repos.d/kubernetes.repo -[kubernetes] -name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 -enabled=1 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg -exclude=kube* -EOF -setenforce 0 -yum install -y docker -systemctl enable docker -systemctl start docker -yum install -y kubelet-1.13.1 kubeadm-1.13.1 kubernetes-cni-0.6.0-0 --disableexcludes=kubernetes - -cat < /etc/default/kubelet -KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=systemd -EOF - -echo '1' > /proc/sys/net/bridge/bridge-nf-call-iptables - -kubeadm join $(curl icanhazip.com):8443 --token 2iqzqm.85bs0x6miyx1nm7l --discovery-token-unsafe-skip-ca-verification -WORKERHEREDOC - -bash /root/workerset-user-data.sh 2>&1 > /root/workerset-user-data.logs - -WORKERSET - -################################################ -######## deploy worker user data and machineset -################################################ - -# NOTE: The secret is rendered twice, the first time when it's run during bootstrapping. -# During bootstrapping, /root/workerset-user-data.sh does not exist yet. -# So \$ needs to be used so the command is executed the second time -# the script is executed. - -cat < /root/worker-secret.yaml -apiVersion: v1 -kind: Secret -metadata: - name: worker-user-data-secret - namespace: default -type: Opaque -data: - userData: \$(cat /root/workerset-user-data.sh | base64 --w=0) -EOF - -sudo kubectl apply -f /root/worker-secret.yaml - -sudo kubectl apply -f config/worker-machineset.yaml -HEREDOC - -bash /root/user-data.sh 2>&1 > /root/user-data.logs diff --git a/config/controllers/deployment.yaml b/config/controllers/deployment.yaml deleted file mode 100644 index fc3dc64b07d..00000000000 --- a/config/controllers/deployment.yaml +++ /dev/null @@ -1,77 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: machine-api-controllers - namespace: default - labels: - api: clusterapi - k8s-app: controller -spec: - selector: - matchLabels: - api: clusterapi - k8s-app: controller - replicas: 1 - template: - metadata: - labels: - api: clusterapi - k8s-app: controller - spec: - securityContext: - runAsNonRoot: true - runAsUser: 65534 - nodeSelector: - node-role.kubernetes.io/master: "" - tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/master - - key: CriticalAddonsOnly - operator: Exists - - effect: NoExecute - key: node.alpha.kubernetes.io/notReady - operator: Exists - - effect: NoExecute - key: node.alpha.kubernetes.io/unreachable - operator: Exists - containers: - - name: controller-manager - image: docker.io/gofed/cluster-api-azure-controller:latest - command: - - "./manager" - args: - - --logtostderr=true - - --v=3 - resources: - requests: - cpu: 100m - memory: 20Mi - limits: - cpu: 100m - memory: 30Mi - - name: machine-controller - image: docker.io/gofed/cluster-api-azure-controller:latest - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - command: - - /machine-controller-manager - args: - - --logtostderr=true - - --v=3 - - name: nodelink-controller - image: docker.io/openshift/origin-machine-api-operator:v4.0.0 - command: - - /nodelink-controller - args: - - --logtostderr=true - - --v=3 - resources: - requests: - cpu: 100m - memory: 20Mi - limits: - cpu: 100m - memory: 30Mi diff --git a/config/crds/machine.openshift.io.crd.yaml b/config/crds/machine.openshift.io.crd.yaml deleted file mode 100644 index 54fd350cd1f..00000000000 --- a/config/crds/machine.openshift.io.crd.yaml +++ /dev/null @@ -1,120 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - labels: - controller-tools.k8s.io: "1.0" - name: machines.machine.openshift.io -spec: - additionalPrinterColumns: - - JSONPath: .status.providerStatus.instanceId - name: Instance - description: Instance ID of machine created in AWS - type: string - - JSONPath: .status.providerStatus.instanceState - name: State - description: State of the AWS instance - type: string - - JSONPath: .spec.providerSpec.value.instanceType - name: Type - description: Type of instance - type: string - - JSONPath: .spec.providerSpec.value.placement.region - name: Region - description: Region associated with machine - type: string - - JSONPath: .spec.providerSpec.value.placement.availabilityZone - name: Zone - description: Zone associated with machine - type: string - - JSONPath: .metadata.creationTimestamp - name: Age - type: date - group: machine.openshift.io - names: - kind: Machine - plural: machines - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - type: string - kind: - type: string - metadata: - type: object - spec: - type: object - properties: - configSource: - type: object - metadata: - type: object - providerSpec: - properties: - value: - type: object - valueFrom: - properties: - machineClass: - properties: - provider: - type: string - type: object - type: object - type: object - taints: - items: - type: object - type: array - versions: - properties: - controlPlane: - type: string - kubelet: - type: string - required: - - kubelet - type: object - required: - - providerSpec - status: - properties: - addresses: - items: - type: object - type: array - conditions: - items: - type: object - type: array - errorMessage: - type: string - errorReason: - type: string - lastUpdated: - format: date-time - type: string - nodeRef: - type: object - providerStatus: - type: object - versions: - properties: - controlPlane: - type: string - kubelet: - type: string - required: - - kubelet - type: object - type: object - version: v1beta1 -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crds/machinedeployment.openshift.io.crd.yaml b/config/crds/machinedeployment.openshift.io.crd.yaml deleted file mode 100644 index 6f54dbec231..00000000000 --- a/config/crds/machinedeployment.openshift.io.crd.yaml +++ /dev/null @@ -1,127 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - labels: - controller-tools.k8s.io: "1.0" - name: machinedeployments.machine.openshift.io -spec: - group: machine.openshift.io - names: - kind: MachineDeployment - plural: machinedeployments - scope: Namespaced - subresources: - scale: - labelSelectorPath: .status.labelSelector - specReplicasPath: .spec.replicas - statusReplicasPath: .status.replicas - status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - type: string - kind: - type: string - metadata: - type: object - spec: - type: object - properties: - minReadySeconds: - format: int32 - type: integer - paused: - type: boolean - progressDeadlineSeconds: - format: int32 - type: integer - replicas: - format: int32 - type: integer - revisionHistoryLimit: - format: int32 - type: integer - selector: - type: object - strategy: - properties: - rollingUpdate: - properties: - maxSurge: {} - maxUnavailable: {} - type: object - type: - type: string - type: object - template: - type: object - properties: - metadata: - type: object - spec: - type: object - properties: - configSource: - type: object - metadata: - type: object - providerSpec: - properties: - value: - type: object - valueFrom: - properties: - machineClass: - properties: - provider: - type: string - type: object - type: object - type: object - taints: - items: - type: object - type: array - versions: - properties: - controlPlane: - type: string - kubelet: - type: string - required: - - kubelet - type: object - required: - - providerSpec - required: - - selector - - template - status: - properties: - availableReplicas: - format: int32 - type: integer - observedGeneration: - format: int64 - type: integer - readyReplicas: - format: int32 - type: integer - replicas: - format: int32 - type: integer - unavailableReplicas: - format: int32 - type: integer - updatedReplicas: - format: int32 - type: integer - type: object - version: v1beta1 -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crds/machineset.openshift.io.crd.yaml b/config/crds/machineset.openshift.io.crd.yaml deleted file mode 100644 index ff12050c03d..00000000000 --- a/config/crds/machineset.openshift.io.crd.yaml +++ /dev/null @@ -1,131 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - labels: - controller-tools.k8s.io: "1.0" - name: machinesets.machine.openshift.io -spec: - group: machine.openshift.io - names: - kind: MachineSet - plural: machinesets - scope: Namespaced - subresources: - scale: - labelSelectorPath: .status.labelSelector - specReplicasPath: .spec.replicas - statusReplicasPath: .status.replicas - status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - type: string - kind: - type: string - metadata: - type: object - spec: - type: object - properties: - minReadySeconds: - format: int32 - type: integer - replicas: - format: int32 - type: integer - selector: - type: object - template: - type: object - properties: - metadata: - type: object - spec: - type: object - properties: - configSource: - type: object - metadata: - type: object - providerSpec: - properties: - value: - type: object - valueFrom: - properties: - machineClass: - properties: - provider: - type: string - type: object - type: object - type: object - taints: - items: - type: object - type: array - versions: - properties: - controlPlane: - type: string - kubelet: - type: string - required: - - kubelet - type: object - required: - - providerSpec - required: - - selector - status: - properties: - availableReplicas: - format: int32 - type: integer - errorMessage: - type: string - errorReason: - type: string - fullyLabeledReplicas: - format: int32 - type: integer - observedGeneration: - format: int64 - type: integer - readyReplicas: - format: int32 - type: integer - replicas: - format: int32 - type: integer - required: - - replicas - type: object - version: v1beta1 - additionalPrinterColumns: - - JSONPath: .spec.replicas - description: Desired Replicas - name: Desired - type: integer - - JSONPath: .status.replicas - description: Current Replicas - name: Current - type: integer - - JSONPath: .status.readyReplicas - description: Ready Replicas - name: Ready - type: integer - - JSONPath: .status.availableReplicas - name: Available - description: Observed number of available replicas - type: string - - JSONPath: .metadata.creationTimestamp - name: Age - type: date -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/generate-bootstrap.sh b/config/generate-bootstrap.sh deleted file mode 100755 index 108b8b9024a..00000000000 --- a/config/generate-bootstrap.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -if [ -z "$AZURE_SUBSCRIPTION_ID" ]; then - echo "AZURE_SUBSCRIPTION_ID env is not set" - exit 1 -fi - -if [ -z "$AZURE_TENANT_ID" ]; then - echo "AZURE_TENANT_ID env is not set" - exit 1 -fi - -if [ -z "$AZURE_CLIENT_ID" ]; then - echo "AZURE_CLIENT_ID env is not set" - exit 1 -fi - -if [ -z "$AZURE_CLIENT_SECRET" ]; then - echo "AZURE_CLIENT_SECRET env is not set" - exit 1 -fi - -script_dir="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P)" - -secrethash=$(cat $script_dir/bootstrap.sh | \ - sed "s/ azure_client_id: FILLIN/ azure_client_id: $(echo -n $AZURE_CLIENT_ID | base64)/" | \ - sed "s/ azure_client_secret: FILLIN/ azure_client_secret: $(echo -n $AZURE_CLIENT_SECRET | base64)/" | \ - sed "s/ azure_subscription_id: FILLIN/ azure_subscription_id: $(echo -n $AZURE_SUBSCRIPTION_ID | base64)/" | \ - sed "s/ azure_tenant_id: FILLIN/ azure_tenant_id: $(echo -n $AZURE_TENANT_ID | base64)/" | \ - base64 --w=0) - -cat < $script_dir/bootstrap.yaml -apiVersion: v1 -kind: Secret -metadata: - name: master-user-data-secret - namespace: default -type: Opaque -data: - userData: $secrethash -EOF diff --git a/config/kustomization.yaml b/config/kustomization.yaml deleted file mode 100644 index 1031f1955b2..00000000000 --- a/config/kustomization.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Adds namespace to all resources. -# namespace: default - -# Value of this field is prepended to the -# names of all resources, e.g. a deployment named -# "wordpress" becomes "alices-wordpress". -# Note that it should also match with the prefix (text before '-') of the namespace -# field above. -#namePrefix: migration- - -# Labels to add to all resources and selectors. -#commonLabels: -# someName: someValue - -# Each entry in this list must resolve to an existing -# resource definition in YAML. These are the resource -# files that kustomize reads, modifies and emits as a -# YAML string, with resources separated by document -# markers ("---"). -resources: -- crds/machine.openshift.io.crd.yaml -- crds/machineset.openshift.io.crd.yaml -- crds/machinedeployment.openshift.io.crd.yaml -- rbac/rbac_role.yaml -- rbac/rbac_role_binding.yaml -- controllers/deployment.yaml diff --git a/config/master-machine.yaml b/config/master-machine.yaml deleted file mode 100644 index 1a114346c9f..00000000000 --- a/config/master-machine.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: "machine.openshift.io/v1beta1" -kind: Machine -metadata: - name: master-machine - labels: - machine.openshift.io/cluster-api-cluster: azure-actuator - machine.openshift.io/cluster-api-machine-role: worker -spec: - versions: - kubelet: 1.13.4 - controlPlane: 1.13.4 - providerSpec: - value: - apiVersion: azureprovider/v1beta1 - kind: AzureMachineProviderSpec - roles: - - Master - location: eastus2 - vmSize: Standard_B2ms - image: - resourceID: /resourceGroups/os4-common/providers/Microsoft.Compute/images/test1-controlplane-0-image-20190529150403 - osDisk: - osType: "Linux" - managedDisk: - storageAccountType: "Premium_LRS" - diskSizeGB: 60 - sshPublicKey: c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDNEd4SGQ1L0pLZVJYMGZOMCt4YzM1eXhLdmtvb0Qwb0l2RnNCdDNHNTNaSXZlTWxwNUppQTRWT0Y3YjJ4cHZmL1FHbVpmWWl4d1JYMHdUKzRWUzYxV1ZNeUdZRUhPcE9QYy85MWZTcTg4bTJZbitBYVhTUUxTbFpaVkZJTDZsK296bjlRQ3NaSXhqSlpkTW5BTlRQdlhWMWpjSVNJeDhmU0pKeWVEdlhFU2FEQ2N1VjdPZTdvd01lVVpseCtUUEhkcU85eEV1OXFuREVYUXo1SUVQQUMwTElSQnVicmJVaTRQZUJFUlFieVBQd1p0Um9NN2pFZ3RuRFhDcmxYbXo2T0N3NXNiaE1FNEJCUVliVjBOV0J3Unl2bHJReDJtYzZHNnJjODJ6OWxJMkRKQ3ZJcnNkRW43NytQZThiWm1MVU83V0sxRUFyd2xXY0FiZU1kYUFkbzcgamNoYWxvdXBAZGhjcC0yNC0xNzAuYnJxLnJlZGhhdC5jb20K - publicIP: true - vnet: os4-common-vnet - managedIdentity: os4-common-identity - subnet: os4-common-node-subnet - credentialsSecret: - name: test - namespace: default - userDataSecret: - name: master-user-data-secret - namespace: default diff --git a/config/master-user-data-secret.yaml b/config/master-user-data-secret.yaml deleted file mode 100644 index 46e120b8fe1..00000000000 --- a/config/master-user-data-secret.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: master-user-data-secret - namespace: default -type: Opaque -data: - userData: | - IyEvYmluL2Jhc2gKCmNhdCA8PEhFUkVET0MgPiAvcm9vdC91c2VyLWRhdGEuc2gKIyEvYmluL2Jh - c2gKCmNhdCA8PEVPRiA+IC9ldGMveXVtLnJlcG9zLmQva3ViZXJuZXRlcy5yZXBvCltrdWJlcm5l - dGVzXQpuYW1lPUt1YmVybmV0ZXMKYmFzZXVybD1odHRwczovL3BhY2thZ2VzLmNsb3VkLmdvb2ds - ZS5jb20veXVtL3JlcG9zL2t1YmVybmV0ZXMtZWw3LXg4Nl82NAplbmFibGVkPTEKZ3BnY2hlY2s9 - MQpyZXBvX2dwZ2NoZWNrPTEKZ3Bna2V5PWh0dHBzOi8vcGFja2FnZXMuY2xvdWQuZ29vZ2xlLmNv - bS95dW0vZG9jL3l1bS1rZXkuZ3BnIGh0dHBzOi8vcGFja2FnZXMuY2xvdWQuZ29vZ2xlLmNvbS95 - dW0vZG9jL3JwbS1wYWNrYWdlLWtleS5ncGcKZXhjbHVkZT1rdWJlKgpFT0YKc2V0ZW5mb3JjZSAw - Cnl1bSBpbnN0YWxsIC15IGRvY2tlcgpzeXN0ZW1jdGwgZW5hYmxlIGRvY2tlcgpzeXN0ZW1jdGwg - c3RhcnQgZG9ja2VyCnl1bSBpbnN0YWxsIC15IGt1YmVsZXQtMS4xMi4zIGt1YmVhZG0tMS4xMi4z - IGt1YmVjdGwtMS4xMi4zIGt1YmVybmV0ZXMtY25pLTAuNi4wLTAgLS1kaXNhYmxlZXhjbHVkZXM9 - a3ViZXJuZXRlcwoKY2F0IDw8RU9GID4gL2V0Yy9kZWZhdWx0L2t1YmVsZXQKS1VCRUxFVF9LVUJF - QURNX0VYVFJBX0FSR1M9LS1jZ3JvdXAtZHJpdmVyPXN5c3RlbWQKRU9GCgplY2hvICcxJyA+IC9w - cm9jL3N5cy9uZXQvYnJpZGdlL2JyaWRnZS1uZi1jYWxsLWlwdGFibGVzCgprdWJlYWRtIGluaXQg - LS1hcGlzZXJ2ZXItYmluZC1wb3J0IDg0NDMgLS10b2tlbiAyaXF6cW0uODViczB4Nm1peXgxbm03 - bCAtLWFwaXNlcnZlci1jZXJ0LWV4dHJhLXNhbnM9JChjdXJsIGljYW5oYXppcC5jb20pIC0tcG9k - LW5ldHdvcmstY2lkcj0xOTIuMTY4LjAuMC8xNiAtdiA2CgojIEVuYWJsZSBuZXR3b3JraW5nIGJ5 - IGRlZmF1bHQuCmt1YmVjdGwgYXBwbHkgLWYgaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQu - Y29tL2Nsb3VkbmF0aXZlbGFicy9rdWJlLXJvdXRlci9tYXN0ZXIvZGFlbW9uc2V0L2t1YmVhZG0t - a3ViZXJvdXRlci55YW1sIC0ta3ViZWNvbmZpZyAvZXRjL2t1YmVybmV0ZXMvYWRtaW4uY29uZgoK - IyBCaW5hcmllcyBleHBlY3RlZCB1bmRlciAvb3B0L2NuaS9iaW4gYXJlIGFjdHVhbGx5IHVuZGVy - IC91c3IvbGliZXhlYy9jbmkKaWYgWyAhIC1lIC9vcHQvY25pL2JpbiBdOyB0aGVuCiAgeXVtIGlu - c3RhbGwgLXkgY29udGFpbmVybmV0d29ya2luZy1jbmkKICBta2RpciAtcCAvb3B0L2NuaS9iaW4K - ICBwdXNoZCAvdXNyL2xpYmV4ZWMvY25pCiAgY3AgYnJpZGdlIGxvb3BiYWNrIGhvc3QtbG9jYWwg - L29wdC9jbmkvYmluCiAgcG9wZApmaQoKbWtkaXIgLXAgL3Jvb3QvLmt1YmUKY3AgLWkgL2V0Yy9r - dWJlcm5ldGVzL2FkbWluLmNvbmYgL3Jvb3QvLmt1YmUvY29uZmlnCmNob3duICQoaWQgLXUpOiQo - aWQgLWcpIC9yb290Ly5rdWJlL2NvbmZpZwpIRVJFRE9DCgpiYXNoIC9yb290L3VzZXItZGF0YS5z - aCAyPiYxID4gL3Jvb3QvdXNlci1kYXRhLmxvZ3MK diff --git a/config/master-user-data.sh b/config/master-user-data.sh deleted file mode 100644 index 4faabccdfb2..00000000000 --- a/config/master-user-data.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -cat < /root/user-data.sh -#!/bin/bash - -cat < /etc/yum.repos.d/kubernetes.repo -[kubernetes] -name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 -enabled=1 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg -exclude=kube* -EOF -setenforce 0 -yum install -y docker -systemctl enable docker -systemctl start docker -yum install -y kubelet-1.12.3 kubeadm-1.12.3 kubectl-1.12.3 kubernetes-cni-0.6.0-0 --disableexcludes=kubernetes - -cat < /etc/default/kubelet -KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=systemd -EOF - -echo '1' > /proc/sys/net/bridge/bridge-nf-call-iptables - -kubeadm init --apiserver-bind-port 8443 --token 2iqzqm.85bs0x6miyx1nm7l --apiserver-cert-extra-sans=$(curl icanhazip.com) --pod-network-cidr=192.168.0.0/16 -v 6 - -# Enable networking by default. -kubectl apply -f https://raw.githubusercontent.com/cloudnativelabs/kube-router/master/daemonset/kubeadm-kuberouter.yaml --kubeconfig /etc/kubernetes/admin.conf - -# Binaries expected under /opt/cni/bin are actually under /usr/libexec/cni -if [ ! -e /opt/cni/bin ]; then - yum install -y containernetworking-cni - mkdir -p /opt/cni/bin - pushd /usr/libexec/cni - cp bridge loopback host-local /opt/cni/bin - popd -fi - -mkdir -p /root/.kube -cp -i /etc/kubernetes/admin.conf /root/.kube/config -chown $(id -u):$(id -g) /root/.kube/config -HEREDOC - -bash /root/user-data.sh 2>&1 > /root/user-data.logs diff --git a/config/rbac/rbac_role.yaml b/config/rbac/rbac_role.yaml deleted file mode 100644 index 243861b578b..00000000000 --- a/config/rbac/rbac_role.yaml +++ /dev/null @@ -1,130 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - creationTimestamp: null - name: cluster-api-manager-role -rules: -- apiGroups: - - cluster.k8s.io - resources: - - clusters - - clusters/status - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - machine.openshift.io - resources: - - machines - - machines/status - - machinesets - - machinesets/status - - machinedeployments - - machinedeployments/status - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - "" - resources: - - nodes - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - "" - resources: - - nodes/status - - pods/status - verbs: - - patch -- apiGroups: - - "" - resources: - - pods/eviction - verbs: - - create -- apiGroups: - - "" - resources: - - pods - verbs: - - get - - watch - - create - - delete - - list -- apiGroups: - - policy - resources: - - poddisruptionbudgets - verbs: - - list - - watch -- apiGroups: - - "" - resources: - - services - - secrets - - replicationcontrollers - - persistentvolumes - - persistentvolumeclaims - verbs: - - list - - watch -- apiGroups: - - apps - resources: - - statefulsets - - replicasets - verbs: - - list - - watch -- apiGroups: - - storage.k8s.io - resources: - - storageclasses - verbs: - - list - - watch -- apiGroups: - - extensions - resources: - - daemonsets - verbs: - - list - - watch - - get -- apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - create - - update -- apiGroups: - - "" - resources: - - events - verbs: - - create - - watch - - list - - patch diff --git a/config/rbac/rbac_role_binding.yaml b/config/rbac/rbac_role_binding.yaml deleted file mode 100644 index 2dd367a6283..00000000000 --- a/config/rbac/rbac_role_binding.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: cluster-api-manager-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-api-manager-role -subjects: -- kind: ServiceAccount - name: default - namespace: default diff --git a/config/sshkey b/config/sshkey deleted file mode 100644 index 566d076132f..00000000000 --- a/config/sshkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEAuBsR3efySnkV9HzdPsXN+csSr5KKA9KCLxbAbdxud2SL3jJa -eSYgOFThe29sab3/0BpmX2IscEV9ME/uFUutVlTMhmBBzqTj3P/dX0qvPJtmJ/gG -l0kC0pWWVRSC+pfqM5/UArGSMYyWXTJwDUz711dY3CEiMfH0iScng71xEmgwnLle -znu6MDHlGZcfkzx3ajvcRLvapwxF0M+SBDwAtCyEQbm621IuD3gREUG8jz8GbUaD -O4xILZw1wq5V5s+jgsObG4TBOAQUGG1dDVgcEcr5a0MdpnOhuq3PNs/ZSNgyQryK -7HRJ++/j3vG2Zi1Du1itRAK8JVnAG3jHWgHaOwIDAQABAoIBAQCt9MX5CwSg4bCh -Bqp2eaiZ8guB4dCOtAVWQQUpyTKHlXWjSai6+A9RqsIzQ6EIeQKRu6AnWDftDXuw -fpXTgWITRKTMA3+qpZq4Yvrk40iY16y671wq7k3AdJ9LXMo1xf0BMm+869PbBZ++ -B75gkvETE/FebeBFmP0Z6uknTYTdggHcGh1GmMsp9GPW+fBuNed4lRJGTqNfUbZx -Dd1onBjOvvx1w496Pwla9qFL0FPY2H8b7J3SkjffM/uFaVmVFm0/CZVts/X53GVH -PHwl7eNe9cHCeXXQMG97wNKJop/C2Ej76684rRTmPW51WaVLP6Jd8oy7Rm4YNvu0 -wJ9nMOiBAoGBAOgwk2a46eMz8yLWbDtNLrtov6XHF/y2560APt+xC/9wr1Z7AbRB -A1bdoFrc2vl8uRzSUowM78HSPNNJjh9UUcahE7zo94Z/DbFAQkN+Jhz+hVxv6jhk -TtUxiQPZH0KTZiPJmknBfRgQKhZhb7Cb/jrgB+613uadwzFqKY/yDhpRAoGBAMr8 -Mm6MTxuuxiKKN5PbRLo+HzeEw3YIIf5R+lIn0qaumJl1SyUfGfV27ofowdiMXKNK -cDq4V8oZxfcYtwu7nh2dlBF/D1KTtnGDguCqBoROODL/xARjvIWTxn6PjwwPwCid -ytBJ9BzbPkA9yu/symMsBpnBE1d2NDL/1uWeKDzLAoGAfxYvZ9codWp21wekH+VE -AeH4m+VYVMNMFV4AC/HdDkiAQAZ9zUqUaFRQM8uUs1+39nWMJwnhpSXMkx08hBtj -0yNRKWIeMWiTdwQkAMsoU1BgcFL1UT5eA8TkKM4LlSYWjtoG7/3O2X/neW6FcpY/ -VbxPuzGiunl5YC+qZhZn77ECgYEAyZUDkH2O4nMDGbIh15hd/IdNARm78y/IcoR/ -D6+0pwulSGEPq2Hjqb3ezOH+AEwEg7WdFvOTW4WU7/t/bQt5zvd64JVKZjuDZ9+u -zeaMakAz15Hg3GsgAZfr/CwdZ2EM+Ekb7RZEc5PXknzLWNHTfAFw3Ki9yJH+7Nbe -V1Jlq1kCgYEAj/A4NGn1tuV15Qv3C7LhHlRmmr5xqFyQVrwuBw6+PEATn5P8tyyi -gPcN2hfNhwnu9CzfY9aYSXJ+5QkxOB8FeXJ/XF1S0dk4phcdbxbNiKns2izet9ha -CtZbFYCPCNHNS2SgtVZcq+VHJCRjgHJPhqx75hTc0YABmcWR2D77WI8= ------END RSA PRIVATE KEY----- diff --git a/config/sshkey.pub b/config/sshkey.pub deleted file mode 100644 index 0066c681ea2..00000000000 --- a/config/sshkey.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4GxHd5/JKeRX0fN0+xc35yxKvkooD0oIvFsBt3G53ZIveMlp5JiA4VOF7b2xpvf/QGmZfYixwRX0wT+4VS61WVMyGYEHOpOPc/91fSq88m2Yn+AaXSQLSlZZVFIL6l+ozn9QCsZIxjJZdMnANTPvXV1jcISIx8fSJJyeDvXESaDCcuV7Oe7owMeUZlx+TPHdqO9xEu9qnDEXQz5IEPAC0LIRBubrbUi4PeBERQbyPPwZtRoM7jEgtnDXCrlXmz6OCw5sbhME4BBQYbV0NWBwRyvlrQx2mc6G6rc82z9lI2DJCvIrsdEn77+Pe8bZmLUO7WK1EArwlWcAbeMdaAdo7 jchaloup@dhcp-24-170.brq.redhat.com diff --git a/config/worker-machineset.yaml b/config/worker-machineset.yaml deleted file mode 100644 index dcc6c743e70..00000000000 --- a/config/worker-machineset.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -apiVersion: "machine.openshift.io/v1beta1" -kind: MachineSet -metadata: - name: worker-machineset - labels: - machine.openshift.io/cluster-api-cluster: azure-actuator -spec: - replicas: 1 - selector: - matchLabels: - machine.openshift.io/cluster-api-machineset: worker-machine - machine.openshift.io/cluster-api-cluster: azure-actuator - template: - metadata: - labels: - machine.openshift.io/cluster-api-cluster: azure-actuator - machine.openshift.io/cluster-api-machineset: worker-machine - spec: - metadata: - labels: - node-role.kubernetes.io/compute: "" - providerSpec: - value: - apiVersion: azureprovider/v1beta1 - kind: AzureMachineProviderSpec - roles: - - Master - location: eastus2 - vmSize: Standard_B2ms - image: - resourceID: /resourceGroups/os4-common/providers/Microsoft.Compute/images/test1-controlplane-0-image-20190529150403 - osDisk: - osType: "Linux" - managedDisk: - storageAccountType: "Premium_LRS" - diskSizeGB: 60 - sshPublicKey: c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDNEd4SGQ1L0pLZVJYMGZOMCt4YzM1eXhLdmtvb0Qwb0l2RnNCdDNHNTNaSXZlTWxwNUppQTRWT0Y3YjJ4cHZmL1FHbVpmWWl4d1JYMHdUKzRWUzYxV1ZNeUdZRUhPcE9QYy85MWZTcTg4bTJZbitBYVhTUUxTbFpaVkZJTDZsK296bjlRQ3NaSXhqSlpkTW5BTlRQdlhWMWpjSVNJeDhmU0pKeWVEdlhFU2FEQ2N1VjdPZTdvd01lVVpseCtUUEhkcU85eEV1OXFuREVYUXo1SUVQQUMwTElSQnVicmJVaTRQZUJFUlFieVBQd1p0Um9NN2pFZ3RuRFhDcmxYbXo2T0N3NXNiaE1FNEJCUVliVjBOV0J3Unl2bHJReDJtYzZHNnJjODJ6OWxJMkRKQ3ZJcnNkRW43NytQZThiWm1MVU83V0sxRUFyd2xXY0FiZU1kYUFkbzcgamNoYWxvdXBAZGhjcC0yNC0xNzAuYnJxLnJlZGhhdC5jb20K - publicIP: true - vnet: os4-common-vnet - managedIdentity: os4-common-identity - subnet: os4-common-node-subnet - credentialsSecret: - name: test - namespace: default - userDataSecret: - name: worker-user-data-secret - namespace: default diff --git a/config/worker-user-data-secret.yaml b/config/worker-user-data-secret.yaml deleted file mode 100644 index d00a34e10e0..00000000000 --- a/config/worker-user-data-secret.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: worker-user-data-secret - namespace: default -type: Opaque -data: - userData: | - IyEvYmluL2Jhc2gKCmNhdCA8PEhFUkVET0MgPiAvcm9vdC91c2VyLWRhdGEuc2gKIyEvYmluL2Jh - c2gKCmNhdCA8PEVPRiA+IC9ldGMveXVtLnJlcG9zLmQva3ViZXJuZXRlcy5yZXBvCltrdWJlcm5l - dGVzXQpuYW1lPUt1YmVybmV0ZXMKYmFzZXVybD1odHRwczovL3BhY2thZ2VzLmNsb3VkLmdvb2ds - ZS5jb20veXVtL3JlcG9zL2t1YmVybmV0ZXMtZWw3LXg4Nl82NAplbmFibGVkPTEKZ3BnY2hlY2s9 - MQpyZXBvX2dwZ2NoZWNrPTEKZ3Bna2V5PWh0dHBzOi8vcGFja2FnZXMuY2xvdWQuZ29vZ2xlLmNv - bS95dW0vZG9jL3l1bS1rZXkuZ3BnIGh0dHBzOi8vcGFja2FnZXMuY2xvdWQuZ29vZ2xlLmNvbS95 - dW0vZG9jL3JwbS1wYWNrYWdlLWtleS5ncGcKZXhjbHVkZT1rdWJlKgpFT0YKc2V0ZW5mb3JjZSAw - Cnl1bSBpbnN0YWxsIC15IGRvY2tlcgpzeXN0ZW1jdGwgZW5hYmxlIGRvY2tlcgpzeXN0ZW1jdGwg - c3RhcnQgZG9ja2VyCnl1bSBpbnN0YWxsIC15IGt1YmVsZXQtMS4xMi4zIGt1YmVhZG0tMS4xMi4z - IGt1YmVybmV0ZXMtY25pLTAuNi4wLTAgLS1kaXNhYmxlZXhjbHVkZXM9a3ViZXJuZXRlcwoKY2F0 - IDw8RU9GID4gL2V0Yy9kZWZhdWx0L2t1YmVsZXQKS1VCRUxFVF9LVUJFQURNX0VYVFJBX0FSR1M9 - LS1jZ3JvdXAtZHJpdmVyPXN5c3RlbWQKRU9GCgplY2hvICcxJyA+IC9wcm9jL3N5cy9uZXQvYnJp - ZGdlL2JyaWRnZS1uZi1jYWxsLWlwdGFibGVzCgprdWJlYWRtIGpvaW4gNTIuMTY3LjE4Ny4xODA6 - ODQ0MyAtLXRva2VuIDJpcXpxbS44NWJzMHg2bWl5eDFubTdsIC0tZGlzY292ZXJ5LXRva2VuLXVu - c2FmZS1za2lwLWNhLXZlcmlmaWNhdGlvbgoKSEVSRURPQwoKYmFzaCAvcm9vdC91c2VyLWRhdGEu - c2ggMj4mMSA+IC9yb290L3VzZXItZGF0YS5sb2dzCg== diff --git a/config/worker-user-data.sh b/config/worker-user-data.sh deleted file mode 100644 index 8b25bd4a28d..00000000000 --- a/config/worker-user-data.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -cat < /root/user-data.sh -#!/bin/bash - -cat < /etc/yum.repos.d/kubernetes.repo -[kubernetes] -name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 -enabled=1 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg -exclude=kube* -EOF -setenforce 0 -yum install -y docker -systemctl enable docker -systemctl start docker -yum install -y kubelet-1.12.3 kubeadm-1.12.3 kubernetes-cni-0.6.0-0 --disableexcludes=kubernetes - -cat < /etc/default/kubelet -KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=systemd -EOF - -echo '1' > /proc/sys/net/bridge/bridge-nf-call-iptables - -kubeadm join 52.167.187.180:8443 --token 2iqzqm.85bs0x6miyx1nm7l --discovery-token-unsafe-skip-ca-verification - -HEREDOC - -bash /root/user-data.sh 2>&1 > /root/user-data.logs diff --git a/hack/boilerplate/boilerplate.Dockerfile.txt b/hack/boilerplate/boilerplate.Dockerfile.txt deleted file mode 100644 index 34cb349c40c..00000000000 --- a/hack/boilerplate/boilerplate.Dockerfile.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright YEAR The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/hack/boilerplate/boilerplate.Makefile.txt b/hack/boilerplate/boilerplate.Makefile.txt deleted file mode 100644 index 34cb349c40c..00000000000 --- a/hack/boilerplate/boilerplate.Makefile.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright YEAR The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/hack/boilerplate/boilerplate.bzl.txt b/hack/boilerplate/boilerplate.bzl.txt deleted file mode 100644 index 34cb349c40c..00000000000 --- a/hack/boilerplate/boilerplate.bzl.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright YEAR The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/hack/boilerplate/boilerplate.go.txt b/hack/boilerplate/boilerplate.go.txt deleted file mode 100644 index 4b76f1fdd88..00000000000 --- a/hack/boilerplate/boilerplate.go.txt +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright YEAR The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ diff --git a/hack/boilerplate/boilerplate.py.txt b/hack/boilerplate/boilerplate.py.txt deleted file mode 100644 index 34cb349c40c..00000000000 --- a/hack/boilerplate/boilerplate.py.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright YEAR The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/hack/boilerplate/boilerplate.sh.txt b/hack/boilerplate/boilerplate.sh.txt deleted file mode 100644 index 34cb349c40c..00000000000 --- a/hack/boilerplate/boilerplate.sh.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright YEAR The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/hack/coalesce.py b/hack/coalesce.py deleted file mode 100644 index 87bd6a737a4..00000000000 --- a/hack/coalesce.py +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env python2 - -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Stolen from https://github.com/kubernetes/test-infra/blob/master/hack/coalesce.py - -"""Coalesces bazel test results into one file.""" - - -import argparse -import os -import re - -import xml.etree.ElementTree as ET - - -BAZEL_FAILURE_HEADER = '''exec ${PAGER:-/usr/bin/less} "$0" || exit 1 ------------------------------------------------------------------------------ -''' - -# from https://www.w3.org/TR/xml11/#charsets -# RestrictedChar ::= [#x1-#x8]|[#xB-#xC]|[#xE-#x1F]|[#x7F-#x84]|[#x86-#x9F] -RESTRICTED_XML_CHARS_RE = re.compile(r'[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F]') - -ANSI_ESCAPE_CODES_RE = re.compile(r'\033\[[\d;]*[@-~]') - - -def test_packages(root): - """Yields test package directories under root.""" - for package, _, files in os.walk(root): - if 'test.xml' in files and 'test.log' in files: - yield package - -def sanitize(text): - if text.startswith(BAZEL_FAILURE_HEADER): - text = text[len(BAZEL_FAILURE_HEADER):] - # ANSI escape sequences should be removed. - text = ANSI_ESCAPE_CODES_RE.sub('', text) - - # And any other badness that slips through. - text = RESTRICTED_XML_CHARS_RE.sub('', text) - return text - - -def result(pkg): - """Given a directory, create a testcase element describing it.""" - elem = ET.Element('testcase') - elem.set('classname', 'go_test') - pkg_parts = pkg.split('/') - elem.set('name', '//%s:%s' % ('/'.join(pkg_parts[1:-1]), pkg_parts[-1])) - elem.set('time', '0') - suites = ET.parse(pkg + '/test.xml').getroot() - for suite in suites: - for case in suite: - for status in case: - if status.tag == 'error' or status.tag == 'failure': - failure = ET.Element('failure') - with open(pkg + '/test.log') as fp: - text = fp.read().decode('UTF-8', 'ignore') - failure.text = sanitize(text) - elem.append(failure) - return elem - - -def main(): - root = ET.Element('testsuite') - root.set('time', '0') - for package in sorted(test_packages('bazel-testlogs')): - root.append(result(package)) - artifacts_dir = os.environ['ARTIFACTS'] - try: - os.mkdir(artifacts_dir) - except OSError: - pass - with open(os.path.join(artifacts_dir, 'junit_bazel.xml'), 'w') as fp: - fp.write(ET.tostring(root, 'UTF-8')) - - -if __name__ == '__main__': - PARSER = argparse.ArgumentParser(description='Coalesce JUnit results.') - PARSER.add_argument('--repo_root', default='.') - ARGS = PARSER.parse_args() - os.chdir(ARGS.repo_root) - main() diff --git a/hack/lib/init.sh b/hack/lib/init.sh deleted file mode 100644 index d4b20fed582..00000000000 --- a/hack/lib/init.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# Copyright 2020 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - - -# os::util::absolute_path returns the absolute path to the directory provided -function os::util::absolute_path() { - local relative_path="$1" - local absolute_path - - pushd "${relative_path}" >/dev/null - relative_path="$( pwd )" - if [[ -h "${relative_path}" ]]; then - absolute_path="$( readlink "${relative_path}" )" - else - absolute_path="${relative_path}" - fi - popd >/dev/null - - echo "${absolute_path}" -} -readonly -f os::util::absolute_path - -# find the absolute path to the root of the Origin source tree -init_source="$( dirname "${BASH_SOURCE}" )/../.." -OS_ROOT="$( os::util::absolute_path "${init_source}" )" -export OS_ROOT -cd "${OS_ROOT}" - -PROJECT_PREFIX="sigs.k8s.io/cluster-api-provider-azure" -OS_OUTPUT_BINPATH="${OS_ROOT}/_output/bin" diff --git a/hack/owner_reset.sh b/hack/owner_reset.sh deleted file mode 100755 index cf7de566cec..00000000000 --- a/hack/owner_reset.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -sudo chown -R $USER bin \ - chown $USER .git/index - \ No newline at end of file diff --git a/hack/print-workspace-status.sh b/hack/print-workspace-status.sh deleted file mode 100755 index 5a5d3182302..00000000000 --- a/hack/print-workspace-status.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash -# Copyright 2018 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -GIT_COMMIT="$(git describe --always --dirty --abbrev=14)" - -if git_status=$(git status --porcelain 2>/dev/null) && [[ -z ${git_status} ]]; then - GIT_TREE_STATE="clean" -else - GIT_TREE_STATE="dirty" -fi - -# stolen from k8s.io/hack/lib/version.sh -# Use git describe to find the version based on tags. -if GIT_VERSION=$(git describe --tags --abbrev=14 2>/dev/null); then - # This translates the "git describe" to an actual semver.org - # compatible semantic version that looks something like this: - # v1.1.0-alpha.0.6+84c76d1142ea4d - # - # TODO: We continue calling this "git version" because so many - # downstream consumers are expecting it there. - DASHES_IN_VERSION=$(echo "${GIT_VERSION}" | sed "s/[^-]//g") - if [[ "${DASHES_IN_VERSION}" == "---" ]] ; then - # We have distance to subversion (v1.1.0-subversion-1-gCommitHash) - GIT_VERSION=$(echo "${GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{14\}\)$/.\1\-\2/") - elif [[ "${DASHES_IN_VERSION}" == "--" ]] ; then - # We have distance to base tag (v1.1.0-1-gCommitHash) - GIT_VERSION=$(echo "${GIT_VERSION}" | sed "s/-g\([0-9a-f]\{14\}\)$/-\1/") - fi - if [[ "${GIT_TREE_STATE}" == "dirty" ]]; then - # git describe --dirty only considers changes to existing files, but - # that is problematic since new untracked .go files affect the build, - # so use our idea of "dirty" from git status instead. - GIT_VERSION+="-dirty" - fi - - - # Try to match the "git describe" output to a regex to try to extract - # the "major" and "minor" versions and whether this is the exact tagged - # version or whether the tree is between two tagged versions. - if [[ "${GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)(\.[0-9]+)?([-].*)?([+].*)?$ ]]; then - GIT_MAJOR=${BASH_REMATCH[1]} - GIT_MINOR=${BASH_REMATCH[2]} - fi - - # If GIT_VERSION is not a valid Semantic Version, then refuse to build. - if ! [[ "${GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)(\.[0-9]+)?(-[0-9A-Za-z.-]+)?(\+[0-9A-Za-z.-]+)?$ ]]; then - echo "GIT_VERSION should be a valid Semantic Version. Current value: ${GIT_VERSION}" - echo "Please see more details here: https://semver.org" - exit 1 - fi -fi - -GIT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2) -GIT_RELEASE_TAG=$(git describe --abbrev=0 --tags) -GIT_RELEASE_COMMIT=$(git rev-list -n 1 ${GIT_RELEASE_TAG} | head -c 14) - -cat <&2 - done - - exit 1 -fi diff --git a/hack/verify_boilerplate.py b/hack/verify_boilerplate.py deleted file mode 100755 index dc80d4ef892..00000000000 --- a/hack/verify_boilerplate.py +++ /dev/null @@ -1,205 +0,0 @@ -#!/usr/bin/env python - -# Copyright 2018 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Verifies that all source files contain the necessary copyright boilerplate -# snippet. - -from __future__ import print_function - -import argparse -import glob -import os -import re -import sys - -def get_args(): - parser = argparse.ArgumentParser() - parser.add_argument( - "filenames", help="list of files to check, all files if unspecified", nargs='*') - - rootdir = os.path.dirname(__file__) + "/../" - rootdir = os.path.abspath(rootdir) - parser.add_argument("--rootdir", default=rootdir, help="root directory to examine") - - default_boilerplate_dir = os.path.join(rootdir, "hack/boilerplate") - parser.add_argument("--boilerplate-dir", default=default_boilerplate_dir) - return parser.parse_args() - - -def get_refs(): - refs = {} - - for path in glob.glob(os.path.join(ARGS.boilerplate_dir, "boilerplate.*.txt")): - extension = os.path.basename(path).split(".")[1] - - ref_file = open(path, 'r') - ref = ref_file.read().splitlines() - ref_file.close() - refs[extension] = ref - - return refs - - -def file_passes(filename, refs, regexs): # pylint: disable=too-many-locals - try: - with open(filename, 'r') as fp: - data = fp.read() - except IOError: - return False - - basename = os.path.basename(filename) - extension = file_extension(filename) - if extension != "": - ref = refs[extension] - else: - ref = refs[basename] - - # remove build tags from the top of Go files - if extension == "go": - con = regexs["go_build_constraints"] - (data, found) = con.subn("", data, 1) - - # remove shebang from the top of shell files - if extension == "sh" or extension == "py": - she = regexs["shebang"] - (data, found) = she.subn("", data, 1) - - data = data.splitlines() - - # if our test file is smaller than the reference it surely fails! - if len(ref) > len(data): - return False - - # trim our file to the same number of lines as the reference file - data = data[:len(ref)] - - year = regexs["year"] - for datum in data: - if year.search(datum): - return False - - # Replace all occurrences of the regex "2017|2016|2015|2014" with "YEAR" - when = regexs["date"] - for idx, datum in enumerate(data): - (data[idx], found) = when.subn('YEAR', datum) - if found != 0: - break - - # if we don't match the reference at this point, fail - if ref != data: - return False - - return True - -def file_extension(filename): - return os.path.splitext(filename)[1].split(".")[-1].lower() - -SKIPPED_DIRS = [ - 'Godeps', 'third_party', '_gopath', '_output', - '.git', 'vendor', '__init__.py', 'node_modules', '.vscode' -] - -# even when generated by bazel we will complain about some generated files -# not having the headers. since they're just generated, ignore them -IGNORE_HEADERS = [ - '// Code generated by go-bindata.', - '// +build !ignore_autogenerated', - '\n\n\n// Code generated by MockGen. DO NOT EDIT.' -] - - -def has_ignored_header(pathname): - with open(pathname, 'r') as myfile: - data = myfile.read() - for header in IGNORE_HEADERS: - if data.startswith(header): - return True - return False - -def normalize_files(files): - newfiles = [] - for pathname in files: - if any(x in pathname for x in SKIPPED_DIRS): - continue - newfiles.append(pathname) - for idx, pathname in enumerate(newfiles): - if not os.path.isabs(pathname): - newfiles[idx] = os.path.join(ARGS.rootdir, pathname) - return newfiles - - -def get_files(extensions): - files = [] - if ARGS.filenames: - files = ARGS.filenames - else: - for root, dirs, walkfiles in os.walk(ARGS.rootdir): - # don't visit certain dirs. This is just a performance improvement - # as we would prune these later in normalize_files(). But doing it - # cuts down the amount of filesystem walking we do and cuts down - # the size of the file list - for dpath in SKIPPED_DIRS: - if dpath in dirs: - dirs.remove(dpath) - - for name in walkfiles: - pathname = os.path.join(root, name) - files.append(pathname) - - files = normalize_files(files) - outfiles = [] - for pathname in files: - basename = os.path.basename(pathname) - extension = file_extension(pathname) - if extension in extensions or basename in extensions: - if not has_ignored_header(pathname): - outfiles.append(pathname) - return outfiles - - -def get_regexs(): - regexs = {} - # Search for "YEAR" which exists in the boilerplate, but shouldn't in the real thing - regexs["year"] = re.compile('YEAR') - # dates can be 2014, 2015, 2016, 2017 or 2018, company holder names can be anything - regexs["date"] = re.compile('(2014|2015|2016|2017|2018|2019)') - # strip // +build \n\n build constraints - regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n", re.MULTILINE) - # strip #!.* from shell/python scripts - regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE) - return regexs - - -def main(): - regexs = get_regexs() - refs = get_refs() - filenames = get_files(refs.keys()) - nonconforming_files = [] - for filename in filenames: - if not file_passes(filename, refs, regexs): - nonconforming_files.append(filename) - - if nonconforming_files: - print('%d files have incorrect boilerplate headers:' % - len(nonconforming_files)) - for filename in sorted(nonconforming_files): - print(os.path.relpath(filename, ARGS.rootdir)) - sys.exit(1) - - -if __name__ == "__main__": - ARGS = get_args() - main() diff --git a/hack/verify_history.sh b/hack/verify_history.sh deleted file mode 100755 index d8b109ae848..00000000000 --- a/hack/verify_history.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Copyright 2019 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Verifies git commits starting from predefined prefix. - -# default to checking most recent commit only if not run by CI pipeline -check_base="${PULL_BASE_SHA:-HEAD^}" -check_sha="${PULL_PULL_SHA:-HEAD}" - -read -d '' help_message << EOF - -commit messages should look like one of: -UPSTREAM: : message (commits that should be carried indefinitely) -UPSTREAM: : message (commits that should be dropped on the next upstream rebase) -UPSTREAM: 1234: message (commits that should be carried until an upstream rebase includes upstream PR 1234) -EOF - -prefix='UPSTREAM: ([0-9]+|<(carry|drop)>): ' - -echo "examining commits between $check_base and $check_sha" -echo - -while read -r message; do - if ! [[ "$message" =~ ^$prefix ]]; then - echo "Git history in this PR doesn't conform to set commit message standards. Offending commit message is:" - echo "$message" - echo - echo "$help_message" - exit 1 - fi - echo "$message" -done < <(git log "$check_base".."$check_sha" --pretty=%s --no-merges) - -echo -echo "All looks good" diff --git a/pkg/cloud/azure/actuators/machineset/controller_suite_test.go b/pkg/cloud/azure/actuators/machineset/controller_suite_test.go index a62be47771b..117b2fc423b 100644 --- a/pkg/cloud/azure/actuators/machineset/controller_suite_test.go +++ b/pkg/cloud/azure/actuators/machineset/controller_suite_test.go @@ -53,7 +53,7 @@ func TestReconciler(t *testing.T) { var _ = BeforeSuite(func() { testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "..", "config", "crds")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1beta1")}, } machinev1.AddToScheme(scheme.Scheme) diff --git a/pkg/cloud/azure/actuators/machineset/controller_test.go b/pkg/cloud/azure/actuators/machineset/controller_test.go index c406ce751c3..720783242ba 100644 --- a/pkg/cloud/azure/actuators/machineset/controller_test.go +++ b/pkg/cloud/azure/actuators/machineset/controller_test.go @@ -77,6 +77,8 @@ var _ = Describe("Reconciler", func() { machineSet, err := newTestMachineSet(namespace.Name, rtc.vmSize, rtc.existingAnnotations) Expect(err).ToNot(HaveOccurred()) + replicas := int32(1) + machineSet.Spec.Replicas = &replicas Expect(c.Create(ctx, machineSet)).To(Succeed()) Eventually(func() map[string]string { diff --git a/pkg/termination/termination_suite_test.go b/pkg/termination/termination_suite_test.go index d33f3b873f1..75fec459f6f 100644 --- a/pkg/termination/termination_suite_test.go +++ b/pkg/termination/termination_suite_test.go @@ -55,7 +55,7 @@ func TestReconciler(t *testing.T) { var _ = BeforeSuite(func() { testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crds")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1beta1")}, } // Use our own scheme so we don't interfere with any test cases diff --git a/tools.go b/tools.go index 442f21da45a..7432435e546 100644 --- a/tools.go +++ b/tools.go @@ -6,6 +6,5 @@ package tools import ( - _ "k8s.io/code-generator" _ "sigs.k8s.io/controller-tools/cmd/controller-gen" )