From e820c905b754ab39708aff2ece693bbe41f030cd Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 14 May 2019 16:02:33 -0700 Subject: [PATCH] Remove unused Azure scripts (#618) This were previously used for setting up azure creds for ACI specific tests, but are no longer needed since that has moved to a separate repo. --- .circleci/config.yml | 7 ------ scripts/create-connector.yaml | 27 -------------------- scripts/createCertAndKey.sh | 10 -------- scripts/createCredentials.sh | 47 ----------------------------------- scripts/envCreation.sh | 1 - scripts/getKubeConfig.sh | 4 --- 6 files changed, 96 deletions(-) delete mode 100644 scripts/create-connector.yaml delete mode 100755 scripts/createCertAndKey.sh delete mode 100644 scripts/createCredentials.sh delete mode 100644 scripts/envCreation.sh delete mode 100644 scripts/getKubeConfig.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 08e79a85e..c262c06f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,13 +25,6 @@ jobs: working_directory: /go/src/github.com/virtual-kubelet/virtual-kubelet steps: - checkout - - run: - name: Create the credentials file - command: sh scripts/createCredentials.sh - - run: | - echo 'export AZURE_AUTH_LOCATION=${outputPathCredsfile}' >> $BASH_ENV - - run: | - echo 'export KUBECONFIG=${outputPathKubeConfigFile}' >> $BASH_ENV - run: name: Build command: V=1 make build diff --git a/scripts/create-connector.yaml b/scripts/create-connector.yaml deleted file mode 100644 index ea37b43a3..000000000 --- a/scripts/create-connector.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: virtual-kubelet - namespace: default -spec: - replicas: 1 - template: - metadata: - labels: - app: virtual-kubelet - spec: - containers: - - name: virtual-kubelet - image: rbitia/virtual-kubelet:latest - imagePullPolicy: Always - env: - - name: AZURE_CLIENT_ID - value: $clientId - - name: AZURE_CLIENT_KEY - value: $clientSecret - - name: AZURE_TENANT_ID - value: $tenantId - - name: AZURE_SUBSCRIPTION_ID - value: $subscriptionId - - name: ACI_RESOURCE_GROUP - value: $aciRecourceGroup diff --git a/scripts/createCertAndKey.sh b/scripts/createCertAndKey.sh deleted file mode 100755 index ef992c6c4..000000000 --- a/scripts/createCertAndKey.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# Generate cert and key for chart -openssl req -newkey rsa:4096 -new -nodes -x509 -days 3650 -keyout key.pem -out cert.pem -subj "/C=US/ST=CA/L=virtualkubelet/O=virtualkubelet/OU=virtualkubelet/CN=virtualkubelet" -if [[ "$OSTYPE" == "darwin"* ]]; then - cert=$(base64 cert.pem) - key=$(base64 key.pem) -else - cert=$(base64 cert.pem -w0) - key=$(base64 key.pem -w0) -fi diff --git a/scripts/createCredentials.sh b/scripts/createCredentials.sh deleted file mode 100644 index 54ce8c591..000000000 --- a/scripts/createCredentials.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# This will build the credentials during the CI -cat < ${outputPathCredsfile} -{ - "clientId": "$clientId", - "clientSecret": "$clientSecret", - "subscriptionId": "$subscriptionId", - "tenantId": "$tenantId", - "activeDirectoryEndpointUrl": "$activeDirectoryEndpointUrl", - "resourceManagerEndpointUrl": "$resourceManagerEndpointUrl", - "activeDirectoryGraphResourceId": "$activeDirectoryGraphResourceId", - "sqlManagementEndpointUrl": "$sqlManagementEndpointUrl", - "galleryEndpointUrl": "$galleryEndpointUrl", - "managementEndpointUrl": "$managementEndpointUrl" -} -EOF - -# This will build the log analytics credentials during CI -cat < ${outputPathLogAnalyticsFile} -{ - "workspaceID": "$omsworkspaceID", - "workspaceKey": "$omsworkspaceKey" -} -EOF - -# This will build the kubeConfig during the CI -cat < ${outputPathKubeConfigFile} ---- -apiVersion: v1 -clusters: -- cluster: - certificate-authority-data: "$kubeConfigCertificateAuthorityData" - server: $kubeConfigServer - name: "aci-connector-k8s" -contexts: -- context: - cluster: "aci-connector-k8s" - user: "aci-connector-k8s-admin" - name: "aci-connector-k8s" -current-context: "aci-connector-k8s" -kind: Config -users: -- name: "aci-connector-k8s-admin" - user: - client-certificate-data: "$kubeConfigClientCertificateData" - client-key-data: "$kubeConfigClientKeyData" -EOF \ No newline at end of file diff --git a/scripts/envCreation.sh b/scripts/envCreation.sh deleted file mode 100644 index a9bf588e2..000000000 --- a/scripts/envCreation.sh +++ /dev/null @@ -1 +0,0 @@ -#!/bin/bash diff --git a/scripts/getKubeConfig.sh b/scripts/getKubeConfig.sh deleted file mode 100644 index 6db25e908..000000000 --- a/scripts/getKubeConfig.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -# Retrieve kubeconfig for CI -az login --service-principal -u http://azure-cli-2017-11-28-20-22-27 -p $clientSecret --tenant $tenantId -az keyvault secret download --vault-name aciconnectorkv --name kubeconfig -f $PWD/config \ No newline at end of file