chore(registry): change deis to drycc

Author: duanhongyi

Makefile

@@ -7,21 +7,21 @@ SHORT_NAME := registry
 include includes.mk versioning.mk
 
 # the filepath to this repository, relative to $GOPATH/src
-REPO_PATH = github.com/deis/registry
+REPO_PATH = github.com/drycc/registry
 
 SHELL_SCRIPTS = $(wildcard _scripts/*.sh contrib/ci/*.sh)
 
 # The following variables describe the containerized development environment
 # and other build options
-DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
+DEV_ENV_IMAGE := quay.io/drycc/go-dev:v0.22.0
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 LDFLAGS := "-s -w -X main.version=${VERSION}"
 BINDIR := ./rootfs/opt/registry/sbin
 
-# Legacy support for DEV_REGISTRY, plus new support for DEIS_REGISTRY.
-DEIS_REGISTRY ?= ${DEV_REGISTRY}
+# Legacy support for DEV_REGISTRY, plus new support for DRYCC_REGISTRY.
+DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 
 ifeq ($(STORAGE_TYPE),)
   STORAGE_TYPE = fs
@@ -52,6 +52,6 @@ test-style:
 	${DEV_ENV_CMD} shellcheck $(SHELL_SCRIPTS)
 
 deploy: check-kubectl docker-build docker-push
-	kubectl --namespace=deis patch deployment deis-$(SHORT_NAME) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
+	kubectl --namespace=drycc patch deployment drycc-$(SHORT_NAME) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
 
 .PHONY: all build build-binary docker-build test test-style deploy

README.md

@@ -1,43 +1,43 @@
 
-|![](https://upload.wikimedia.org/wikipedia/commons/thumb/1/17/Warning.svg/156px-Warning.svg.png) | Deis Workflow will soon no longer be maintained.<br />Please [read the announcement](https://deis.com/blog/2017/deis-workflow-final-release/) for more detail. |
+|![](https://upload.wikimedia.org/wikipedia/commons/thumb/1/17/Warning.svg/156px-Warning.svg.png) | Drycc Workflow will soon no longer be maintained.<br />Please [read the announcement](https://drycc.com/blog/2017/drycc-workflow-final-release/) for more detail. |
 |---:|---|
-| 09/07/2017 | Deis Workflow [v2.18][] final release before entering maintenance mode |
+| 09/07/2017 | Drycc Workflow [v2.18][] final release before entering maintenance mode |
 | 03/01/2018 | End of Workflow maintenance: critical patches no longer merged |
 
-# Deis Registry v2
+# Drycc Registry v2
 
-[![Build Status](https://ci.deis.io/job/registry/badge/icon)](https://ci.deis.io/job/registry)
-[![Go Report Card](https://goreportcard.com/badge/github.com/deis/registry)](https://goreportcard.com/report/github.com/deis/registry)
-[![Docker Repository on Quay](https://quay.io/repository/deisci/registry/status "Docker Repository on Quay")](https://quay.io/repository/deisci/registry)
+[![Build Status](https://ci.drycc.cc/job/registry/badge/icon)](https://ci.drycc.cc/job/registry)
+[![Go Report Card](https://goreportcard.com/badge/github.com/drycc/registry)](https://goreportcard.com/report/github.com/drycc/registry)
+[![Docker Repository on Quay](https://quay.io/repository/drycc/registry/status "Docker Repository on Quay")](https://quay.io/repository/drycc/registry)
 
 
-Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy and manage
-applications on your own servers. Deis builds on [Kubernetes](http://kubernetes.io/) to provide
+Drycc (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy and manage
+applications on your own servers. Drycc builds on [Kubernetes](http://kubernetes.io/) to provide
 a lightweight, [Heroku-inspired](http://heroku.com) workflow.
 
 We welcome your input! If you have feedback, please submit an [issue][issues]. If you'd like to participate in development, please read the "Development" section below and submit a [pull request][prs].
 
 # About
 
-The registry is a [Docker registry](https://docs.docker.com/registry/) component for use in Kubernetes. While it's intended for use inside of the Deis open source [PaaS](https://en.wikipedia.org/wiki/Platform_as_a_service), it's flexible enough to be used as a standalone pod on any Kubernetes cluster.
+The registry is a [Docker registry](https://docs.docker.com/registry/) component for use in Kubernetes. While it's intended for use inside of the Drycc open source [PaaS](https://en.wikipedia.org/wiki/Platform_as_a_service), it's flexible enough to be used as a standalone pod on any Kubernetes cluster.
 
 If you decide to use this component standalone, you can host your own Docker registry in your own Kubernetes cluster.
 
 The Docker image that this repository builds is based on [the official Docker v2 registry image](https://github.com/docker/distribution).
 
 # Development
 
-The Deis project welcomes contributions from all developers. The high level process for development matches many other open source projects. See below for an outline.
+The Drycc project welcomes contributions from all developers. The high level process for development matches many other open source projects. See below for an outline.
 
 * Fork this repository
 * Make your changes
 * Submit a pull request (PR) to this repository with your changes, and unit tests whenever possible.
 	* If your PR fixes any issues, make sure you write Fixes #1234 in your PR description (where #1234 is the number of the issue you're closing)
-* The Deis core contributors will review your code. After each of them sign off on your code, they'll label your PR with LGTM1 and LGTM2 (respectively). Once that happens, the contributors will merge it
+* The Drycc core contributors will review your code. After each of them sign off on your code, they'll label your PR with LGTM1 and LGTM2 (respectively). Once that happens, the contributors will merge it
 
 ## Deploying
 
-If you want to use the latest registry image built by they Deis team you can simply start a registry via `make deploy`.
+If you want to use the latest registry image built by they Drycc team you can simply start a registry via `make deploy`.
 
 If however, you want to build and use a custom image see the instructions below.
 
@@ -49,7 +49,7 @@ To build a dev release of this image, you will also need a registry to hold the
 First, configure your environment to point to the registry location.
 
 ```console
-$ export DEIS_REGISTRY=myregistry.com:5000  # or quay.io, if using Dockerhub, leave this unset
+$ export DRYCC_REGISTRY=myregistry.com:5000  # or quay.io, if using Dockerhub, leave this unset
 $ export IMAGE_PREFIX=youruser/             # if using Quay or Dockerhub
 ```
 
@@ -65,6 +65,6 @@ To deploy the image via patching the registry deployment run:
 $ make deploy
 ```
 
-[issues]: https://github.com/deisthree/registry/issues
-[prs]: https://github.com/deisthree/registry/pulls
-[v2.18]: https://github.com/deisthree/workflow/releases/tag/v2.18.0
+[issues]: https://github.com/drycc/registry/issues
+[prs]: https://github.com/drycc/registry/pulls
+[v2.18]: https://github.com/drycc/workflow/releases/tag/v2.18.0

charts/registry/Chart.yaml

@@ -1,7 +1,7 @@
 name: registry
-home: https://github.com/deisthree/registry
+home: https://github.com/drycc/registry
 version: <Will be populated by the ci before publishing the chart>
-description: Docker registry for Deis Workflow.
+description: Docker registry for Drycc Workflow.
 maintainers:
-  - name: Deis Team
-    email: engineering@deis.com
+  - name: Drycc Team
+    email: engineering@drycc.com

charts/registry/templates/registry-deployment.yaml

@@ -2,11 +2,11 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: deis-registry
+  name: drycc-registry
   labels:
-    heritage: deis
+    heritage: drycc
   annotations:
-    component.deis.io/version: {{ .Values.docker_tag }}
+    component.drycc.cc/version: {{ .Values.docker_tag }}
 spec:
   replicas: 1
   strategy:
@@ -16,15 +16,15 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      app: deis-registry
+      app: drycc-registry
   template:
     metadata:
       labels:
-        app: deis-registry
+        app: drycc-registry
     spec:
-      serviceAccount: deis-registry
+      serviceAccount: drycc-registry
       containers:
-        - name: deis-registry
+        - name: drycc-registry
           image: quay.io/{{.Values.org}}/registry:{{.Values.docker_tag}}
           imagePullPolicy: {{.Values.pull_policy}}
 {{- if or (.Values.limits_cpu) (.Values.limits_memory)}}
@@ -62,7 +62,7 @@ spec:
             - name: registry-storage
               mountPath: /var/lib/registry
             - name: objectstorage-creds
-              mountPath: /var/run/secrets/deis/registry/creds
+              mountPath: /var/run/secrets/drycc/registry/creds
       volumes:
         - name: registry-storage
           emptyDir: {}

charts/registry/templates/registry-service-account.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: deis-registry
+  name: drycc-registry
   labels:
-    heritage: deis
+    heritage: drycc
 {{- end }}

charts/registry/templates/registry-service.yaml

@@ -2,15 +2,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: deis-registry
+  name: drycc-registry
   labels:
-    heritage: deis
+    heritage: drycc
 spec:
   ports:
     - name: http
       port: 80
       targetPort: 5000
   selector:
-    app: deis-registry
+    app: drycc-registry
   sessionAffinity: ClientIP  
 {{- end }}

charts/registry/values.yaml

@@ -1,4 +1,4 @@
-org: "deisci"
+org: "drycc"
 pull_policy: "Always"
 docker_tag: canary
 # limits_cpu: "100m"

main.go

@@ -11,8 +11,8 @@ import (
 const (
 	registryBinary  = "/bin/registry"
 	registryConfig  = "/etc/docker/registry/config.yml"
-	minioHostEnvVar = "DEIS_MINIO_SERVICE_HOST"
-	minioPortEnvVar = "DEIS_MINIO_SERVICE_PORT"
+	minioHostEnvVar = "DRYCC_MINIO_SERVICE_HOST"
+	minioPortEnvVar = "DRYCC_MINIO_SERVICE_PORT"
 	command         = "serve"
 )
 
@@ -21,19 +21,19 @@ func main() {
 	storageType := getenv("REGISTRY_STORAGE", "filesystem")
 	if storageType == "gcs" {
 		log.Println("INFO: using google cloud storage as the backend")
-		if _, err := os.Stat("/var/run/secrets/deis/registry/creds/key.json"); err != nil {
+		if _, err := os.Stat("/var/run/secrets/drycc/registry/creds/key.json"); err != nil {
 			log.Fatal("Service account not given")
 		}
-		os.Setenv("REGISTRY_STORAGE_GCS_KEYFILE", "/var/run/secrets/deis/registry/creds/key.json")
-		if bucket, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/registry-bucket"); err != nil {
+		os.Setenv("REGISTRY_STORAGE_GCS_KEYFILE", "/var/run/secrets/drycc/registry/creds/key.json")
+		if bucket, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/registry-bucket"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_GCS_BUCKET", string(bucket))
 			os.Setenv("BUCKET_NAME", string(bucket))
 		}
 	} else if storageType == "s3" {
 		log.Println("INFO: using s3 as the backend")
-		if accesskey, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/accesskey"); err != nil {
+		if accesskey, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/accesskey"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_S3_ACCESSKEY", string(accesskey))
@@ -42,7 +42,7 @@ func main() {
 			}
 		}
 
-		if secretkey, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/secretkey"); err != nil {
+		if secretkey, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/secretkey"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_S3_SECRETKEY", string(secretkey))
@@ -51,34 +51,34 @@ func main() {
 			}
 		}
 
-		if region, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/region"); err != nil {
+		if region, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/region"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_S3_REGION", string(region))
 			os.Setenv("AWS_REGION", string(region))
 		}
 
-		if bucket, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/registry-bucket"); err != nil {
+		if bucket, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/registry-bucket"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_S3_BUCKET", string(bucket))
 			os.Setenv("BUCKET_NAME", string(bucket))
 		}
 	} else if storageType == "azure" {
 		log.Println("INFO: using azure as the backend")
-		if accountname, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/accountname"); err != nil {
+		if accountname, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/accountname"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_AZURE_ACCOUNTNAME", string(accountname))
 		}
 
-		if accountkey, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/accountkey"); err != nil {
+		if accountkey, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/accountkey"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_AZURE_ACCOUNTKEY", string(accountkey))
 		}
 
-		if container, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/registry-container"); err != nil {
+		if container, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/registry-container"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_AZURE_CONTAINER", string(container))
@@ -97,14 +97,14 @@ func main() {
 		os.Setenv("S3_PORT", mPort)
 		os.Setenv("S3_USE_SIGV4", "true")
 
-		if accesskey, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/accesskey"); err != nil {
+		if accesskey, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/accesskey"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_S3_ACCESSKEY", string(accesskey))
 			os.Setenv("AWS_ACCESS_KEY_ID", string(accesskey))
 		}
 
-		if secretkey, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/secretkey"); err != nil {
+		if secretkey, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/secretkey"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_S3_SECRETKEY", string(secretkey))
@@ -118,38 +118,38 @@ func main() {
 
 	} else if storageType == "swift" {
 		log.Println("INFO: using swift as the backend")
-		if authurl, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/authurl"); err != nil {
+		if authurl, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/authurl"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_SWIFT_AUTHURL", string(authurl))
 		}
 
-		if username, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/username"); err != nil {
+		if username, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/username"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_SWIFT_USERNAME", string(username))
 		}
 
-		if password, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/password"); err != nil {
+		if password, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/password"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_SWIFT_PASSWORD", string(password))
 		}
 
-		if container, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/registry-container"); err != nil {
+		if container, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/registry-container"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_SWIFT_CONTAINER", string(container))
 			os.Setenv("BUCKET_NAME", string(container))
 		}
 
-		if authVersion, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/authversion"); err != nil {
+		if authVersion, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/authversion"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_SWIFT_AUTHVERSION", string(authVersion))
 		}
 
-		if tenant, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/tenant"); err != nil {
+		if tenant, err := ioutil.ReadFile("/var/run/secrets/drycc/registry/creds/tenant"); err != nil {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_SWIFT_TENANT", string(tenant))

rootfs/Dockerfile

@@ -10,7 +10,7 @@ RUN buildDeps='gcc git linux-headers musl-dev python3-dev' && \
     apk add --no-cache $buildDeps && \
     # "upgrade" boto to 2.43.0 + the patch to fix minio connections
     pip install --disable-pip-version-check --no-cache-dir --upgrade \
-        git+https://github.com/teamhephy/boto@abb38474ee5124bb571da0c42be67cd27c47094f \
+        git+https://github.com/drycc/boto@abb38474ee5124bb571da0c42be67cd27c47094f \
         azure==1.0.3 \
         gcloud==0.18.3 \
         python-swiftclient==3.1.0 \

versioning.mk

@@ -1,13 +1,13 @@
 MUTABLE_VERSION ?= canary
 VERSION ?= git-$(shell git rev-parse --short HEAD)
-IMAGE_PREFIX ?= deis
+IMAGE_PREFIX ?= drycc
 
-IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
-MUTABLE_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
+IMAGE := ${DRYCC_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
+MUTABLE_IMAGE := ${DRYCC_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
 
 info:
 	@echo "Build tag:       ${VERSION}"
-	@echo "Registry:        ${DEIS_REGISTRY}"
+	@echo "Registry:        ${DRYCC_REGISTRY}"
 	@echo "Immutable tag:   ${IMAGE}"
 	@echo "Mutable tag:     ${MUTABLE_IMAGE}"