Skip to content

Commit 20bb5e7

Browse files
committed
chore(controller): change deis to drycc
1 parent c86f61f commit 20bb5e7

106 files changed

Lines changed: 555 additions & 554 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/PULL_REQUEST_TEMPLATE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
If your change requires any additions or changes to the [documentation][docs] or to the [end-to-end test suite][e2e], please submit them as 1 or more pull requests against that repo and refer to them here.
22

3-
requires deis/workflow#1234
4-
requires deis/workflow-e2e#5678
3+
requires drycc/workflow#1234
4+
requires drycc/workflow-e2e#5678
55

66

7-
[docs]: https://github.com/deisthree/workflow
8-
[e2e]: https://github.com/deisthree/workflow-e2e
7+
[docs]: https://github.com/drycc/workflow
8+
[e2e]: https://github.com/drycc/workflow-e2e

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ develop-eggs
1414
lib
1515
lib64
1616

17-
# Deis' config file
18-
controller/deis/local_settings.py
17+
# Drycc' config file
18+
controller/drycc/local_settings.py
1919
controller/.secret_key
2020

2121
# local binaries, installers, and artifacts
22-
client/deis
22+
client/drycc
2323
client/client
24-
client/deis.exe
24+
client/drycc.exe
2525
client/*.run
2626
client/makeself/
2727
_dist/

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributing to Deis
1+
# Contributing to Drycc
22

3-
This project is part of Deis. You can find the latest contribution
4-
guidelines [in our documentation](https://deis.com/docs/workflow/contributing/overview/).
3+
This project is part of Drycc. You can find the latest contribution
4+
guidelines [in our documentation](https://drycc.com/docs/workflow/contributing/overview/).

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# If DEIS_REGISTRY is not set, try to populate it from legacy DEV_REGISTRY
2-
DEIS_REGISTRY ?= $(DEV_REGISTRY)
3-
IMAGE_PREFIX ?= deis
1+
# If DRYCC_REGISTRY is not set, try to populate it from legacy DEV_REGISTRY
2+
DRYCC_REGISTRY ?= $(DEV_REGISTRY)
3+
IMAGE_PREFIX ?= drycc
44
COMPONENT ?= controller
55
SHORT_NAME ?= $(COMPONENT)
66

77
include versioning.mk
88

9-
SHELLCHECK_PREFIX := docker run -v ${CURDIR}:/workdir -w /workdir quay.io/deis/shell-dev shellcheck
9+
SHELLCHECK_PREFIX := docker run -v ${CURDIR}:/workdir -w /workdir quay.io/drycc/go-dev:v0.22.0 shellcheck
1010
SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh') $(wildcard _scripts/*.sh)
1111

1212
# Test processes used in quick unit testing
@@ -34,7 +34,7 @@ docker-build-test: check-docker
3434
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
3535

3636
deploy: check-kubectl docker-build docker-push
37-
kubectl --namespace=deis patch deployment deis-$(COMPONENT) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
37+
kubectl --namespace=drycc patch deployment drycc-$(COMPONENT) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
3838

3939
clean: check-docker
4040
docker rmi $(IMAGE)
@@ -58,7 +58,7 @@ test-functional:
5858
@echo "Implement functional tests in _tests directory"
5959

6060
test-integration:
61-
@echo "Check https://github.com/deisthree/workflow-e2e for the complete integration test suite"
61+
@echo "Check https://github.com/drycc/workflow-e2e for the complete integration test suite"
6262

6363
upload-coverage:
6464
$(eval CI_ENV := $(shell curl -s https://codecov.io/env | bash))

README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11

2-
# Deis Controller
2+
# Drycc Controller
33

4-
[![Build Status](https://ci.deis.io/job/controller/badge/icon)](https://ci.deis.io/job/controller)
5-
[![codecov.io](https://codecov.io/github/deis/controller/coverage.svg?branch=master)](https://codecov.io/github/deis/controller?branch=master)
6-
[![Docker Repository on Quay](https://quay.io/repository/deisci/controller/status "Docker Repository on Quay")](https://quay.io/repository/deisci/controller)
4+
[![Build Status](https://ci.drycc.cc/job/controller/badge/icon)](https://ci.drycc.cc/job/controller)
5+
[![codecov.io](https://codecov.io/github/drycc/controller/coverage.svg?branch=master)](https://codecov.io/github/drycc/controller?branch=master)
6+
[![Docker Repository on Quay](https://quay.io/repository/drycc/controller/status "Docker Repository on Quay")](https://quay.io/repository/drycc/controller)
77
[![Dependency Status](https://www.versioneye.com/user/projects/5863f1de6f4bf900128fa95a/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5863f1de6f4bf900128fa95a)
88

9-
Deis (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own servers.
9+
Drycc (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own servers.
1010

11-
For more information about the Deis Workflow, please visit the main project page at https://github.com/deisthree/workflow.
11+
For more information about the Drycc Workflow, please visit the main project page at https://github.com/drycc/workflow.
1212

1313
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].
1414

1515
# About
1616

17-
The Controller is the central API server for [Deis Workflow][workflow]. It is installed on a [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own cluster. Below is a non-exhaustive list of things it can do:
17+
The Controller is the central API server for [Drycc Workflow][workflow]. It is installed on a [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own cluster. Below is a non-exhaustive list of things it can do:
1818

1919
* Create a new application
2020
* Delete an application
@@ -24,13 +24,13 @@ The Controller is the central API server for [Deis Workflow][workflow]. It is in
2424

2525
# Development
2626

27-
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.
27+
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.
2828

2929
* Fork this repository
3030
* Make your changes
3131
* [Submit a pull request][prs] (PR) to this repository with your changes, and unit tests whenever possible.
3232
* If your PR fixes any [issues][issues], make sure you write Fixes #1234 in your PR description (where #1234 is the number of the issue you're closing)
33-
* Deis project maintainers will review your code.
33+
* Drycc project maintainers will review your code.
3434
* After two maintainers approve it, they will merge your PR.
3535

3636
## Prerequisites
@@ -47,38 +47,38 @@ You'll want to test your code changes interactively in a working Kubernetes clus
4747

4848
### Workflow Installation
4949

50-
After you have a working Kubernetes cluster, you're ready to [install Workflow](https://deis.com/docs/workflow/installing-workflow/).
50+
After you have a working Kubernetes cluster, you're ready to [install Workflow](https://drycc.com/docs/workflow/installing-workflow/).
5151

5252
## Testing Your Code
5353

5454
When you've built your new feature or fixed a bug, make sure you've added appropriate unit tests and run `make test` to ensure your code works properly.
5555

5656
Also, since this component is central to the platform, it's recommended that you manually test and verify that your feature or fix works as expected. To do so, ensure the following environment variables are set:
5757

58-
* `DEIS_REGISTRY` - A Docker registry that you have push access to and your Kubernetes cluster can pull from
58+
* `DRYCC_REGISTRY` - A Docker registry that you have push access to and your Kubernetes cluster can pull from
5959
* If this is [Docker Hub](https://hub.docker.com/), leave this variable empty
6060
* Otherwise, ensure it has a trailing `/`. For example, if you're using [Quay.io](https://quay.io), use `quay.io/`
61-
* `IMAGE_PREFIX` - The organization in the Docker repository. This defaults to `deis`, but if you don't have access to that organization, set this to one you have push access to.
61+
* `IMAGE_PREFIX` - The organization in the Docker repository. This defaults to `drycc`, but if you don't have access to that organization, set this to one you have push access to.
6262
* `SHORT_NAME` (optional) - The name of the image. This defaults to `controller`
6363
* `VERSION` (optional) - The tag of the Docker image. This defaults to the current Git SHA (the output of `git rev-parse --short HEAD`)
6464

6565
Then, run `make deploy` to build and push a new Docker image with your changes and replace the existing one with your new one in the Kubernetes cluster. See below for an example with appropriate environment variables.
6666

6767
```console
68-
export DEIS_REGISTRY=quay.io/
68+
export DRYCC_REGISTRY=quay.io/
6969
export IMAGE_PREFIX=arschles
7070
make deploy
7171
```
7272

7373
After the `make deploy` finishes, a new pod will be launched but may not be running. You'll need to wait until the pod is listed as `Running` and the value in its `Ready` column is `1/1`. Use the following command watch the pod's status:
7474

7575
```console
76-
kubectl get pod --namespace=deis -w | grep deis-controller
76+
kubectl get pod --namespace=drycc -w | grep drycc-controller
7777
```
7878

7979
[install-k8s]: https://kubernetes.io/docs/setup/pick-right-solution
80-
[issues]: https://github.com/deisthree/controller/issues
81-
[prs]: https://github.com/deisthree/controller/pulls
82-
[workflow]: https://github.com/deisthree/workflow
80+
[issues]: https://github.com/drycc/controller/issues
81+
[prs]: https://github.com/drycc/controller/pulls
82+
[workflow]: https://github.com/drycc/workflow
8383
[Docker]: https://www.docker.com/
84-
[v2.18]: https://github.com/deisthree/workflow/releases/tag/v2.18.0
84+
[v2.18]: https://github.com/drycc/workflow/releases/tag/v2.18.0

_scripts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Workflow Contrib
22

3-
Scripts and tools that are not a core part of Deis Workflow v2.
3+
Scripts and tools that are not a core part of Drycc Workflow v2.

_scripts/util/commit-msg

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
#
3-
# This hook verifies that the commit message follows deis commit style
4-
# To install this hook run the following command from the deis git root
3+
# This hook verifies that the commit message follows drycc commit style
4+
# To install this hook run the following command from the drycc git root
55
# cp contrib/util/commit-msg .git/hooks/commit-msg
66
set -eo pipefail
77

@@ -38,7 +38,7 @@ if ! [[ $SUBJECT =~ $subject_regex ]]; then
3838
echo "test"
3939
echo "chore"
4040
echo ""
41-
echo "Read more at http://docs.deis.io/en/latest/contributing/standards/$NORMAL"
41+
echo "Read more at http://docs.drycc.cc/en/latest/contributing/standards/$NORMAL"
4242
exit 0
4343
fi
4444

@@ -47,21 +47,21 @@ if ! [[ $SUBJECT =~ $capital_regex ]]; then
4747
echo ""
4848
echo "$SUBJECT"
4949
echo ""
50-
echo "Read more at http://docs.deis.io/en/latest/contributing/standards/$NORMAL"
50+
echo "Read more at http://docs.drycc.cc/en/latest/contributing/standards/$NORMAL"
5151
exit 0
5252
fi
5353

5454
if [[ ${#SUBJECT} -gt 50 ]]; then
5555
echo "${YELLOW}WARNING - Subject shouldn't be longer than 50 characters."
5656
echo ""
57-
echo "Read more at http://docs.deis.io/en/latest/contributing/standards/$NORMAL"
57+
echo "Read more at http://docs.drycc.cc/en/latest/contributing/standards/$NORMAL"
5858
exit 0
5959
fi
6060

6161
if [[ ${#MESSAGE[2]} -gt 0 ]]; then
6262
echo "${RED}ERROR - Second line must be blank"
6363
echo ""
64-
echo "Read more at http://docs.deis.io/en/latest/contributing/standards/$NORMAL"
64+
echo "Read more at http://docs.drycc.cc/en/latest/contributing/standards/$NORMAL"
6565
exit 0
6666
fi
6767

@@ -71,11 +71,11 @@ do
7171
if [[ ${#MESSAGE[$i]} -gt 72 ]] && [[ ${MESSAGE[$i]:0:1} != '#' ]]; then
7272
echo "${RED}ERROR on line $i - can't be longer than 72 characters."
7373
echo ""
74-
echo "Read more at http://docs.deis.io/en/latest/contributing/standards/$NORMAL"
74+
echo "Read more at http://docs.drycc.cc/en/latest/contributing/standards/$NORMAL"
7575
exit 0
7676
fi
7777
done
7878

79-
echo "Your commit message follows the deis commit style."
79+
echo "Your commit message follows the drycc commit style."
8080

8181
exit 0

charts/controller/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: controller
2-
home: https://github.com/deisthree/controller
2+
home: https://github.com/drycc/controller
33
version: <Will be populated by the ci before publishing the chart>
4-
description: Deis Workflow Controller (API).
4+
description: Drycc Workflow Controller (API).
55
maintainers:
6-
- name: Deis Team
7-
email: engineering@deis.com
6+
- name: Drycc Team
7+
email: engineering@drycc.com

charts/controller/templates/controller-clusterrole.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
kind: ClusterRole
44
apiVersion: {{ template "rbacAPIVersion" . }}
55
metadata:
6-
name: deis:deis-controller
6+
name: drycc:drycc-controller
77
labels:
8-
app: deis-controller
9-
heritage: deis
8+
app: drycc-controller
9+
heritage: drycc
1010
rules:
1111
- apiGroups: [""]
1212
resources: ["namespaces"]

charts/controller/templates/controller-clusterrolebinding.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
kind: ClusterRoleBinding
44
apiVersion: {{ template "rbacAPIVersion" . }}
55
metadata:
6-
name: deis:deis-controller
6+
name: drycc:drycc-controller
77
labels:
8-
app: deis-controller
9-
heritage: deis
8+
app: drycc-controller
9+
heritage: drycc
1010
roleRef:
1111
apiGroup: rbac.authorization.k8s.io
1212
kind: ClusterRole
13-
name: deis:deis-controller
13+
name: drycc:drycc-controller
1414
subjects:
1515
- kind: ServiceAccount
16-
name: deis-controller
16+
name: drycc-controller
1717
namespace: {{ .Release.Namespace }}
1818
{{- end -}}
1919
{{- end -}}

0 commit comments

Comments
 (0)