diff --git a/Makefile b/Makefile index 47f7e9e..11d25e1 100644 --- a/Makefile +++ b/Makefile @@ -18,12 +18,6 @@ IMAGE_PREFIX ?= deis include versioning.mk -RC := manifests/deis-${SHORT_NAME}-rc.yaml -SVC := manifests/deis-${SHORT_NAME}-service.yaml -ADMIN_SEC := manifests/deis-${SHORT_NAME}-secretAdmin.yaml -USER_SEC := manifests/deis-${SHORT_NAME}-secretUser.yaml -# note that we are not running minio with ssl turned on. this variable is commented -# SSL_SEC := manifests/deis-${SHORT_NAME}-secretssl-final.yaml MC_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc:${VERSION} MC_INTEGRATION_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc-integration:${VERSION} @@ -52,51 +46,10 @@ docker-build: build build-server # build the main image docker build --rm -t ${IMAGE} rootfs docker tag -f ${IMAGE} ${MUTABLE_IMAGE} - # These are both YAML specific - perl -pi -e "s|image: [a-z0-9.:]+\/deis\/${SHORT_NAME}:[0-9a-z-.]+|image: ${IMAGE}|g" ${RC} - perl -pi -e "s|release: [a-zA-Z0-9.+_-]+|release: ${VERSION}|g" ${RC} deploy: build docker-build docker-push kube-rc -# TODO: would be nice to refactor all of this code into a single binary. 1/2 of it is already written in genssl/manifest_replace.go. -# the other 1/2 is in gen.sh, and should be refactored as a few 'exec.Command' calls... -# -# NOTE: that we are not currently running the minio server with ssl turned on. this target is currently not used -ssl-cert: - # generate ssl certs - docker run --rm -v "${CURDIR}":/pwd -w /pwd centurylink/openssl:0.0.1 ./genssl/gen.sh - # replace values in ssl secrets file - docker run --rm -v "${CURDIR}":/pwd -w /pwd golang:1.5.1-alpine go run ./genssl/manifest_replace.go --cert=./genssl/server.cert --key=./genssl/server.key --tpl=./manifests/deis-minio-secretssl-tpl.yaml --out=./manifests/deis-minio-secretssl-final.yaml - -kube-rc: - kubectl create -f ${RC} - -# note that we are not running minio with ssl turned on. the ssl related dependency and commands are commented out in this target -kube-secrets: #ssl-cert - kubectl create -f ${ADMIN_SEC} - kubectl create -f ${USER_SEC} - # kubectl create -f ${SSL_SEC} - -# note that we are not running minio with ssl turned on. the ssl related dependency and commands are commented out in this target -kube-clean-secrets: - kubectl delete secret minio-user - kubectl delete secret minio-admin - # kubectl delete secret minio-ssl - -kube-service: kube-secrets - - kubectl create -f ${SVC} - - kubectl create -f manifests/deis-minio-secretUser.yaml - -kube-clean: - - kubectl delete rc deis-${SHORT_NAME}-rc - -kube-mc: - kubectl create -f manifests/deis-mc-pod.yaml - -kube-mc-integration: - kubectl create -f manifests/deis-mc-integration-pod.yaml - # build the minio server build-server: docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.6 ./install.sh diff --git a/manifests/README.md b/manifests/README.md deleted file mode 100644 index a80fb2b..0000000 --- a/manifests/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Kubernetes Definitions - -This provides a service definition and a replication controller for -Minio. diff --git a/manifests/deis-mc-integration-pod.yaml b/manifests/deis-mc-integration-pod.yaml deleted file mode 100644 index d79fb7b..0000000 --- a/manifests/deis-mc-integration-pod.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# A debugging utility for testing Minio from within k8s. -apiVersion: v1 -kind: Pod -metadata: - name: deis-mc-integration - labels: - heritage: deis - version: 2.0.0-beta -spec: - restartPolicy: Never - containers: - - name: mc - imagePullPolicy: Always - image: quay.io/deisci/mc-integration:v2-beta - command: - - /bin/integration.sh - args: - - "mode memory limit 512MB" - volumeMounts: - - name: minio-user - mountPath: /var/run/secrets/deis/minio/user - readOnly: true - - name: minio-ssl - mountPath: /var/run/secrets/deis/minio/ssl - readOnly: true - volumes: - - name: minio-user - secret: - secretName: minio-user - - name: minio-ssl - secret: - secretName: minio-ssl diff --git a/manifests/deis-mc-pod.yaml b/manifests/deis-mc-pod.yaml deleted file mode 100644 index a482ec8..0000000 --- a/manifests/deis-mc-pod.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# A debugging utility for testing Minio from within k8s. -apiVersion: v1 -kind: Pod -metadata: - name: deis-mc - labels: - heritage: deis - version: 2.0.0-beta -spec: - restartPolicy: Never - containers: - - name: mc - imagePullPolicy: Always - image: quay.io/deisci/mc:v2-beta - command: - - mc - args: - - "mode memory limit 512MB" - volumeMounts: - - name: minio-user - mountPath: /var/run/secrets/deis/minio/user - readOnly: true - volumes: - - name: minio-user - secret: - secretName: minio-user diff --git a/manifests/deis-minio-rc.yaml b/manifests/deis-minio-rc.yaml deleted file mode 100644 index 909e996..0000000 --- a/manifests/deis-minio-rc.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: v1 -kind: ReplicationController -metadata: - name: deis-minio - labels: - heritage: deis - release: 2.0.0-beta -spec: - replicas: 1 - selector: - app: deis-minio - template: - metadata: - labels: - app: deis-minio - spec: - containers: - - name: deis-minio - image: quay.io/arschles/minio:devel - imagePullPolicy: Always - env: - - name: HEALTH_SERVER_PORT - value: "8082" - ports: - - containerPort: 9000 - - containerPort: 8082 - livenessProbe: - httpGet: - path: /healthz - port: 8092 - initialDelaySeconds: 30 - timeoutSeconds: 1 - readinessProbe: - httpGet: - path: /healthz - port: 8092 - initialDelaySeconds: 30 - timeoutSeconds: 1 - command: - - boot - args: - # not running with ssl yet - # - "--cert=/var/run/secrets/deis/minio/ssl/access-cert" - # - "--key=/var/run/secrets/deis/minio/ssl/access-pem" - - "server" - - "/home/minio/" - volumeMounts: - - name: minio-admin - mountPath: /var/run/secrets/deis/minio/admin - readOnly: true - - name: minio-user - mountPath: /var/run/secrets/deis/minio/user - readOnly: true - # - name: minio-ssl - # mountPath: /var/run/secrets/deis/minio/ssl - # readOnly: true - volumes: - - name: minio-admin - secret: - secretName: minio-admin - - name: minio-user - secret: - secretName: minio-user - # - name: minio-ssl - # secret: - # secretName: minio-ssl diff --git a/manifests/deis-minio-secretAdmin.yaml b/manifests/deis-minio-secretAdmin.yaml deleted file mode 100644 index 902f962..0000000 --- a/manifests/deis-minio-secretAdmin.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: minio-admin - heritage: deis -type: Opaque -data: - access-key-id: YWRtaW4K - access-secret-key: cGRHOFJwdzBoOFF0eHliSHNNSGxrSnR6SnpaMnNDN2IyY0ZCRWduKwo= diff --git a/manifests/deis-minio-secretUser.yaml b/manifests/deis-minio-secretUser.yaml deleted file mode 100644 index 7f63b4c..0000000 --- a/manifests/deis-minio-secretUser.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: minio-user - heritage: deis -type: Opaque -data: - access-key-id: OFRaUlkySlJXTVBUNlVNWFI2STUK - access-secret-key: Z2JzdHJPdm90TU1jZzJzTWZHVWhBNWE2RXQvRUk1QUx0SUhzb2JZawo= diff --git a/manifests/deis-minio-secretssl-tpl.yaml b/manifests/deis-minio-secretssl-tpl.yaml deleted file mode 100644 index c11cb3d..0000000 --- a/manifests/deis-minio-secretssl-tpl.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: minio-ssl - heritage: deis -type: Opaque -data: - # generated by make ssl-cert - access-cert: | - {{.AccessCert}} - # generated by make ssl-cert - access-pem: | - {{.AccessPem}} diff --git a/manifests/deis-minio-service.yaml b/manifests/deis-minio-service.yaml deleted file mode 100644 index 667e38c..0000000 --- a/manifests/deis-minio-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - # Give this a useful name. - name: deis-minio - labels: - heritage: deis - release: 0.0.0 -spec: - ports: - - port: 9000 - targetPort: 9000 - name: s3 - protocol: TCP - selector: - app: deis-minio