Skip to content

Commit 4fb25fc

Browse files
committed
chore(registry): remove ecr and gcr registry
1 parent 2d0de92 commit 4fb25fc

2 files changed

Lines changed: 2 additions & 53 deletions

File tree

charts/workflow/values.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ global:
4747
# Valid values are:
4848
# - on-cluster: Run registry within the Kubernetes cluster
4949
# - off-cluster: Use registry outside the Kubernetes cluster (example: dockerhub,quay.io,self-hosted)
50-
# - ecr: Use Amazon's ECR
51-
# - gcr: Use Google's GCR
5250
registry_location: "on-cluster"
5351
# The host port to which registry proxy binds to
5452
registry_service_port: 5555

src/installing-workflow/configuring-registry.md

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ When using a private registry the docker images are no longer pulled by Drycc Wo
1717

1818
Drycc Workflow currently supports:
1919

20-
1. Google Container Registry([gcr][gcr]).
21-
1. EC2 Container Registry([ecr][ecr]).
2220
1. off-cluster: Any provider which supports long-lived username/password authentication, such as [Azure Container Registry][acr], [Docker Hub][dockerhub], [quay.io][quay], or a self-hosted Docker registry.
2321

2422
## Configuration
@@ -33,50 +31,6 @@ You are now ready to `helm install drycc/workflow --namespace drycc -f values.ya
3331
## Examples
3432
Here we show how the relevant parts of the fetched `values.yaml` file might look like after configuring for a particular off-cluster registry:
3533

36-
### ECR
37-
38-
```
39-
global:
40-
...
41-
registry_location: "ecr"
42-
...
43-
registry-token-refresher:
44-
# Time in minutes after which the token should be refreshed.
45-
# Leave it empty to use the default provider time.
46-
token_refresh_time: ""
47-
...
48-
ecr:
49-
# Your AWS access key. Leave it empty if you want to use IAM credentials.
50-
accesskey: "ACCESS_KEY"
51-
# Your AWS secret key. Leave it empty if you want to use IAM credentials.
52-
secretkey: "SECRET_KEY"
53-
# Any S3 region
54-
region: "us-west-2"
55-
registryid: ""
56-
hostname: ""
57-
...
58-
```
59-
**Note:** `registryid` and `hostname` should _not_ be set. See [this issue](https://github.com/drycc/registry-token-refresher/issues/2) for more info.
60-
61-
### GCR
62-
63-
```
64-
global:
65-
...
66-
registry_location: "gcr"
67-
...
68-
registry-token-refresher:
69-
# Time in minutes after which the token should be refreshed.
70-
# Leave it empty to use the default provider time.
71-
token_refresh_time: ""
72-
...
73-
gcr:
74-
key_json: <base64-encoded JSON data>
75-
hostname: ""
76-
```
77-
78-
**Note:** `hostname` should be left empty.
79-
8034
### [Azure Container Registry](https://azure.microsoft.com/en-us/services/container-registry/) (ACR)
8135

8236
After following the [docs](https://docs.microsoft.com/en-us/azure/container-registry/container-registry-get-started-azure-cli) and creating a registry, e.g. `myregistry`, with its corresponding login server of `myregistry.azurecr.io`, the following values should be supplied:
@@ -88,7 +42,7 @@ global:
8842
...
8943
registry-token-refresher:
9044
...
91-
off_cluster_registry:
45+
registry:
9246
hostname: "myregistry.azurecr.io"
9347
organization: "myorg"
9448
username: "myusername"
@@ -107,7 +61,7 @@ global:
10761
...
10862
registry-token-refresher:
10963
...
110-
off_cluster_registry:
64+
registry:
11165
hostname: "quay.io"
11266
organization: "myorg"
11367
username: "myusername"
@@ -117,12 +71,9 @@ registry-token-refresher:
11771

11872
[registry]: ../understanding-workflow/components.md#registry
11973
[storage]: configuring-object-storage
120-
[ecr]: http://docs.aws.amazon.com/AmazonECR/latest/userguide/ECR_GetStarted.html
121-
[gcr]: https://cloud.google.com/container-registry/
12274
[acr]: https://docs.microsoft.com/en-us/azure/container-registry/
12375
[dockerhub]: https://hub.docker.com/
12476
[quay]: https://quay.io/
12577
[srvAccount]: https://support.google.com/cloud/answer/6158849#serviceaccounts
126-
[aws-iam]: https://aws.amazon.com/iam/
12778
[namespace]: https://docs.docker.com/registry/spec/api/#/overview
12879
[Kubernetes]: https://kubernetes.io

0 commit comments

Comments
 (0)