From 3f1594859dfc20e2986db034a7ae7cb74439217d Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Fri, 13 Apr 2018 10:25:17 +0100 Subject: [PATCH 1/3] Delete old/unused test files. Merge wait-minikube.sh into ci.sh. --- hack/ci.sh | 39 +++++++++++++++++++++++++++++++++- hack/test/setup-boulder.sh | 30 -------------------------- hack/test/setup-minikube.sh | 9 -------- hack/test/wait-boulder.sh | 14 ------------ hack/test/wait-minikube.sh | 37 -------------------------------- hack/ubuntu-nsenter/Dockerfile | 12 ----------- hack/ubuntu-nsenter/README.md | 12 ----------- 7 files changed, 38 insertions(+), 115 deletions(-) delete mode 100755 hack/test/setup-boulder.sh delete mode 100755 hack/test/setup-minikube.sh delete mode 100755 hack/test/wait-boulder.sh delete mode 100755 hack/test/wait-minikube.sh delete mode 100644 hack/ubuntu-nsenter/Dockerfile delete mode 100644 hack/ubuntu-nsenter/README.md diff --git a/hack/ci.sh b/hack/ci.sh index 82653d8d5..aa9cd011a 100755 --- a/hack/ci.sh +++ b/hack/ci.sh @@ -10,11 +10,48 @@ set -o pipefail make build APP_VERSION=build # Wait for e2e service dependencies -./hack/test/wait-minikube.sh +echo "Waiting for minikube cluster to be ready..." +while true; do if kubectl get nodes; then break; fi; echo "Waiting 5s for kubernetes to be ready..."; sleep 5; done + +echo "Installing helm with cluster-admin privileges..." +cat < /dev/null 2>&1 ; do - echo "Waiting for boulder API to be available..." - sleep 5 -done - -echo "Boulder API now available at ${BOULDER_URL}" diff --git a/hack/test/wait-minikube.sh b/hack/test/wait-minikube.sh deleted file mode 100755 index 3f4a1005b..000000000 --- a/hack/test/wait-minikube.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o nounset -set -o pipefail - -while true; do if kubectl get nodes; then break; fi; echo "Waiting 5s for kubernetes to be ready..."; sleep 5; done - -echo "Installing helm..." -cat < Date: Fri, 13 Apr 2018 10:27:06 +0100 Subject: [PATCH 2/3] Remove boulder helm chart --- contrib/charts/boulder/.helmignore | 21 ----- contrib/charts/boulder/Chart.yaml | 4 - contrib/charts/boulder/templates/_helpers.tpl | 16 ---- .../boulder/templates/bhsm-deployment.yaml | 31 -------- .../boulder/templates/bhsm-service.yaml | 19 ----- .../boulder/templates/bmysql-deployment.yaml | 31 -------- .../boulder/templates/bmysql-service.yaml | 19 ----- .../boulder/templates/boulder-deployment.yaml | 66 ---------------- .../boulder/templates/boulder-service.yaml | 79 ------------------- contrib/charts/boulder/values.yaml | 4 - 10 files changed, 290 deletions(-) delete mode 100644 contrib/charts/boulder/.helmignore delete mode 100644 contrib/charts/boulder/Chart.yaml delete mode 100644 contrib/charts/boulder/templates/_helpers.tpl delete mode 100644 contrib/charts/boulder/templates/bhsm-deployment.yaml delete mode 100644 contrib/charts/boulder/templates/bhsm-service.yaml delete mode 100644 contrib/charts/boulder/templates/bmysql-deployment.yaml delete mode 100644 contrib/charts/boulder/templates/bmysql-service.yaml delete mode 100644 contrib/charts/boulder/templates/boulder-deployment.yaml delete mode 100644 contrib/charts/boulder/templates/boulder-service.yaml delete mode 100644 contrib/charts/boulder/values.yaml diff --git a/contrib/charts/boulder/.helmignore b/contrib/charts/boulder/.helmignore deleted file mode 100644 index f0c131944..000000000 --- a/contrib/charts/boulder/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/contrib/charts/boulder/Chart.yaml b/contrib/charts/boulder/Chart.yaml deleted file mode 100644 index 20eb0c115..000000000 --- a/contrib/charts/boulder/Chart.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -description: A Helm chart for Kubernetes -name: boulder -version: 0.1.0 diff --git a/contrib/charts/boulder/templates/_helpers.tpl b/contrib/charts/boulder/templates/_helpers.tpl deleted file mode 100644 index f0d83d2ed..000000000 --- a/contrib/charts/boulder/templates/_helpers.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/contrib/charts/boulder/templates/bhsm-deployment.yaml b/contrib/charts/boulder/templates/bhsm-deployment.yaml deleted file mode 100644 index db14d34a3..000000000 --- a/contrib/charts/boulder/templates/bhsm-deployment.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.7.0 () - creationTimestamp: null - labels: - io.kompose.service: bhsm - name: bhsm -spec: - replicas: 1 - strategy: {} - template: - metadata: - creationTimestamp: null - labels: - io.kompose.service: bhsm - spec: - containers: - - args: - - /usr/local/bin/pkcs11-daemon - - /usr/lib/softhsm/libsofthsm2.so - env: - - name: PKCS11_DAEMON_SOCKET - value: tcp://0.0.0.0:5657 - image: letsencrypt/boulder-tools:2017-12-18 - name: bhsm - resources: {} - restartPolicy: Always -status: {} diff --git a/contrib/charts/boulder/templates/bhsm-service.yaml b/contrib/charts/boulder/templates/bhsm-service.yaml deleted file mode 100644 index 2cbc27858..000000000 --- a/contrib/charts/boulder/templates/bhsm-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.7.0 () - creationTimestamp: null - labels: - io.kompose.service: bhsm - name: boulder-hsm -spec: - ports: - - name: headless - port: 5657 - targetPort: 5657 - selector: - io.kompose.service: bhsm -status: - loadBalancer: {} diff --git a/contrib/charts/boulder/templates/bmysql-deployment.yaml b/contrib/charts/boulder/templates/bmysql-deployment.yaml deleted file mode 100644 index 54458c72b..000000000 --- a/contrib/charts/boulder/templates/bmysql-deployment.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.7.0 () - creationTimestamp: null - labels: - io.kompose.service: bmysql - name: bmysql -spec: - replicas: 1 - strategy: {} - template: - metadata: - creationTimestamp: null - labels: - io.kompose.service: bmysql - spec: - containers: - - args: - - mysqld - - --bind-address=0.0.0.0 - env: - - name: MYSQL_ALLOW_EMPTY_PASSWORD - value: "yes" - image: mariadb:10.1 - name: bmysql - resources: {} - restartPolicy: Always -status: {} diff --git a/contrib/charts/boulder/templates/bmysql-service.yaml b/contrib/charts/boulder/templates/bmysql-service.yaml deleted file mode 100644 index e9625bb3e..000000000 --- a/contrib/charts/boulder/templates/bmysql-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.7.0 () - creationTimestamp: null - labels: - io.kompose.service: bmysql - name: boulder-mysql -spec: - ports: - - name: sql - port: 3306 - targetPort: 3306 - selector: - io.kompose.service: bmysql -status: - loadBalancer: {} diff --git a/contrib/charts/boulder/templates/boulder-deployment.yaml b/contrib/charts/boulder/templates/boulder-deployment.yaml deleted file mode 100644 index aa3b7a709..000000000 --- a/contrib/charts/boulder/templates/boulder-deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.7.0 () - creationTimestamp: null - labels: - io.kompose.service: boulder - name: boulder -spec: - replicas: 1 - strategy: - type: Recreate - template: - metadata: - creationTimestamp: null - labels: - io.kompose.service: boulder - spec: - hostname: boulder - containers: - - env: - - name: BOULDER_CONFIG_DIR - value: test/config - - name: FAKE_DNS - value: 10.0.0.10 - - name: PKCS11_PROXY_SOCKET - value: tcp://boulder-hsm:5657 - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - name: boulder - readinessProbe: - httpGet: - path: / - port: 4000 - ports: - - containerPort: 4000 - - containerPort: 4001 - - containerPort: 4002 - - containerPort: 4003 - - containerPort: 4430 - - containerPort: 4431 - - containerPort: 4500 - - containerPort: 6000 - - containerPort: 8000 - - containerPort: 8001 - - containerPort: 8002 - - containerPort: 8003 - - containerPort: 8004 - - containerPort: 8005 - - containerPort: 8006 - - containerPort: 8008 - - containerPort: 8009 - - containerPort: 8010 - - containerPort: 8055 - - containerPort: 9380 - - containerPort: 9381 - resources: {} - volumeMounts: - - mountPath: /tmp - name: boulder-claim0 - restartPolicy: Always - volumes: - - name: boulder-claim0 - emptyDir: {} -status: {} diff --git a/contrib/charts/boulder/templates/boulder-service.yaml b/contrib/charts/boulder/templates/boulder-service.yaml deleted file mode 100644 index af8f27c28..000000000 --- a/contrib/charts/boulder/templates/boulder-service.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.7.0 () - creationTimestamp: null - labels: - io.kompose.service: boulder - name: boulder -spec: - ports: - - name: "4000" - port: 4000 - targetPort: 4000 - - name: "4001" - port: 4001 - targetPort: 4001 - - name: "4002" - port: 4002 - targetPort: 4002 - - name: "4003" - port: 4003 - targetPort: 4003 - - name: "4430" - port: 4430 - targetPort: 4430 - - name: "4431" - port: 4431 - targetPort: 4431 - - name: "4500" - port: 4500 - targetPort: 4500 - - name: "6000" - port: 6000 - targetPort: 6000 - - name: "8000" - port: 8000 - targetPort: 8000 - - name: "8001" - port: 8001 - targetPort: 8001 - - name: "8002" - port: 8002 - targetPort: 8002 - - name: "8003" - port: 8003 - targetPort: 8003 - - name: "8004" - port: 8004 - targetPort: 8004 - - name: "8005" - port: 8005 - targetPort: 8005 - - name: "8006" - port: 8006 - targetPort: 8006 - - name: "8008" - port: 8008 - targetPort: 8008 - - name: "8009" - port: 8009 - targetPort: 8009 - - name: "8010" - port: 8010 - targetPort: 8010 - - name: "8055" - port: 8055 - targetPort: 8055 - - name: "9380" - port: 9380 - targetPort: 9380 - - name: "9381" - port: 9381 - targetPort: 9381 - selector: - io.kompose.service: boulder -status: - loadBalancer: {} diff --git a/contrib/charts/boulder/values.yaml b/contrib/charts/boulder/values.yaml deleted file mode 100644 index 00d87e5c2..000000000 --- a/contrib/charts/boulder/values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -image: - repository: quay.io/munnerz/boulder - tag: "20180115.1" - pullPolicy: IfNotPresent From 22fde8b450bbbe10f71573a4809a187677fdc194 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Fri, 13 Apr 2018 10:50:17 +0100 Subject: [PATCH 3/3] Don't run verify-chart-version against directories that no longer exist --- hack/verify-chart-version.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hack/verify-chart-version.sh b/hack/verify-chart-version.sh index 40273e370..e6491006f 100755 --- a/hack/verify-chart-version.sh +++ b/hack/verify-chart-version.sh @@ -90,6 +90,10 @@ for directory in ${CHANGED_FOLDERS}; do if [ "${directory}" == "contrib/charts" ]; then continue fi + if [ ! -d "${directory}" ]; then + echo "Directory ${directory} has been deleted. Skipping version check..." + continue + fi semvercompare "${directory}" done