Skip to content

Commit 3ef93b7

Browse files
committed
fix(workflow):oci install error
1 parent 6acbeaf commit 3ef93b7

11 files changed

Lines changed: 44 additions & 60 deletions

File tree

_scripts/install.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ init_arch() {
1818
}
1919

2020
init_registry() {
21+
CHARTS_URL=oci://registry.drycc.cc/$([ $CHANNEL == "stable" ] && echo charts || echo charts-testing)
2122
if [[ -z "$DRYCC_REGISTRY" ]] ; then
2223
echo -e "\\033[32m---> Get the fastest drycc registry...\\033[0m"
2324
registrys=(quay.io ccr.ccs.tencentyun.com sgccr.ccs.tencentyun.com jpccr.ccs.tencentyun.com uswccr.ccs.tencentyun.com useccr.ccs.tencentyun.com deccr.ccs.tencentyun.com saoccr.ccs.tencentyun.com)
@@ -59,8 +60,6 @@ function install_helm {
5960
tar -zxvf "${tar_name}"
6061
mv "linux-${ARCH}/helm" /usr/local/bin/helm
6162
rm -rf "${tar_name}" "linux-${ARCH}"
62-
helm repo add --force-update drycc oci://registry.drycc.cc/$([ $CHANNEL == "stable" ] && echo charts || echo charts-testing)
63-
helm repo update
6463
}
6564

6665
function configure_os {
@@ -180,7 +179,7 @@ function check_metallb {
180179
function install_network() {
181180
echo -e "\\033[32m--->Start installing network...\\033[0m"
182181
api_server_address=(`ip -o route get to 8.8.8.8 | sed -n 's/.*src \([0-9.]\+\).*/\1/p'`)
183-
helm install cilium drycc/cilium \
182+
helm install cilium $CHARTS_URL/cilium \
184183
--set tunnel=geneve \
185184
--set operator.replicas=1 \
186185
--set bandwidthManager=true \
@@ -197,7 +196,7 @@ function install_network() {
197196
function install_metallb() {
198197
check_metallb
199198
echo -e "\\033[32m--->Start installing metallb...\\033[0m"
200-
helm install metallb drycc/metallb \
199+
helm install metallb $CHARTS_URL/metallb \
201200
--set speaker.frr.enabled=true \
202201
--namespace metallb \
203202
--create-namespace
@@ -246,7 +245,7 @@ EOF
246245

247246
function install_traefik() {
248247
echo -e "\\033[32m--->Start installing traefik...\\033[0m"
249-
helm install traefik drycc/traefik \
248+
helm install traefik $CHARTS_URL/traefik \
250249
--namespace traefik \
251250
--create-namespace --wait -f - <<EOF
252251
service:
@@ -270,7 +269,7 @@ EOF
270269

271270
function install_cert_manager() {
272271
echo -e "\\033[32m--->Start installing cert-manager...\\033[0m"
273-
helm install cert-manager drycc/cert-manager \
272+
helm install cert-manager $CHARTS_URL/cert-manager \
274273
--namespace cert-manager \
275274
--create-namespace \
276275
--set clusterResourceNamespace=drycc \
@@ -280,7 +279,7 @@ function install_cert_manager() {
280279

281280
function install_catalog() {
282281
echo -e "\\033[32m--->Start installing catalog...\\033[0m"
283-
helm install catalog drycc/catalog \
282+
helm install catalog $CHARTS_URL/catalog \
284283
--set asyncBindingOperationsEnabled=true \
285284
--set image=docker.io/drycc/service-catalog:canary \
286285
--namespace catalog \
@@ -477,7 +476,7 @@ imagebuilder:
477476
EOF
478477
fi
479478

480-
helm install drycc drycc/workflow \
479+
helm install drycc $CHARTS_URL/workflow \
481480
--namespace drycc \
482481
--values /tmp/drycc-values.yaml \
483482
--values /tmp/drycc-mirror-values.yaml \
@@ -499,7 +498,7 @@ function install_helmbroker {
499498

500499
echo -e "\\033[32m---> Start installing helmbroker...\\033[0m"
501500

502-
helm install helmbroker drycc/helmbroker \
501+
helm install helmbroker $CHARTS_URL/helmbroker \
503502
--set ingressClass="traefik" \
504503
--set platformDomain="cluster.local" \
505504
--set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:-5Gi} \

src/_includes/install-workflow.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,12 @@ Server: &version.Version{SemVer:"v2.5.0", GitCommit:"012cb0ac1a1b2f888144ef5a67b
1010

1111
Ensure the `kubectl` client is installed and can connect to your Kubernetes cluster.
1212

13-
## Add the Drycc Chart Repository
14-
15-
The Drycc Chart Repository contains everything needed to install Drycc Workflow onto a Kubernetes cluster, with a single `helm install drycc/workflow --namespace drycc` command.
16-
17-
Add this repository to Helm:
18-
19-
```
20-
$ helm repo add drycc oci://registry.drycc.cc/charts
21-
```
22-
2313
## Install Drycc Workflow
2414

2515
Now that Helm is installed and the repository has been added, install Workflow by running:
2616

2717
```
28-
$ helm install drycc/workflow --namespace drycc
18+
$ helm install drycc oci://registry.drycc.cc/charts/workflow --namespace drycc
2919
```
3020

3121
Helm will install a variety of Kubernetes resources in the `drycc` namespace.

src/installing-workflow/configuring-object-storage.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,24 @@ If applicable, generate credentials that have create and write access to the sto
2727

2828
If you are using AWS S3 and your Kubernetes nodes are configured with appropriate [IAM][aws-iam] API keys via InstanceRoles, you do not need to create API credentials. Do, however, validate that the InstanceRole has appropriate permissions to the configured buckets!
2929

30-
### Step 3: Add Drycc Repo
31-
32-
If you haven't already added the Helm repo, do so with `helm repo add drycc oci://registry.drycc.cc/charts`
33-
34-
### Step 4: Configure Workflow Chart
30+
### Step 3: Configure Workflow Chart
3531

3632
Operators should configure object storage by editing the Helm values file before running `helm install`. To do so:
3733

38-
* Fetch the Helm values by running `helm inspect values drycc/workflow > values.yaml`
34+
* Fetch the Helm values by running `helm inspect values oci://registry.drycc.cc/charts/workflow > values.yaml`
3935
* Update the `global/storage` parameter to reference the platform you are using, e.g. `s3`, `azure`, `gcs`, or `swift`
4036
* Find the corresponding section for your storage type and provide appropriate values including region, bucket names, and access credentials.
4137
* Save your changes.
4238

4339
!!! note
4440
All values will be automatically (base64) encoded _except_ the `key_json` values under `gcs`/`gcr`. These must be base64-encoded. This is to support cleanly passing said encoded text via `helm --set` cli functionality rather than attempting to pass the raw JSON data. For example:
4541

46-
$ helm install workflow --namespace drycc \
42+
$ helm install drycc oci://registry.drycc.cc/charts/workflow \
43+
--namespace drycc \
4744
--set global.platformDomain=youdomain.com
4845
--set global.storage=gcs,gcs.key_json="$(cat /path/to/gcs_creds.json | base64 -w 0)"
4946

50-
You are now ready to run `helm install drycc/workflow --namespace drycc -f values.yaml` using your desired object storage.
47+
You are now ready to run `helm install drycc oci://registry.drycc.cc/charts/workflow --namespace drycc -f values.yaml` using your desired object storage.
5148

5249

5350
[storage]: ../understanding-workflow/components.md#object-storage

src/installing-workflow/configuring-postgres.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The Helm chart for Drycc Workflow can be easily configured to connect the Workfl
3939
* Save your changes.
4040
* Note: you do not need to (and must not) base64 encode any values, as the Helm chart will automatically handle encoding as necessary.
4141

42-
You are now ready to `helm install drycc/workflow --namespace drycc -f values.yaml` [as usual][installing].
42+
You are now ready to `helm install drycc oci://registry.drycc.cc/charts/workflow --namespace drycc -f values.yaml` [as usual][installing].
4343

4444
[database]: ../understanding-workflow/components.md#database
4545
[object storage]: configuring-object-storage.md

src/installing-workflow/configuring-registry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Drycc Workflow currently supports:
2626
* Update the `registryLocation` parameter to reference the registry location you are using: `off-cluster`, `ecr`, `gcr`
2727
* Update the values in the section which corresponds to your registry location type.
2828

29-
You are now ready to `helm install drycc/workflow --namespace drycc -f values.yaml` using your desired registry.
29+
You are now ready to `helm install drycc oci://registry.drycc.cc/charts/workflow --namespace drycc -f values.yaml` using your desired registry.
3030

3131
## Examples
3232
Here we show how the relevant parts of the fetched `values.yaml` file might look like after configuring for a particular off-cluster registry:

src/installing-workflow/index.md

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,6 @@ More rigorous installations would benefit from using outside sources for the fol
3737

3838
Now, workflow requires that ingress and cert-manager must be installed. Any compatible Kubernetes entry controller can be used, but only ingress-nginx and ingress-traefik currently support enforced HTTPS and allowlist. Enable entries in accordance with [this guide](./ingress.md).
3939

40-
## Add the Drycc Chart Repository
41-
42-
The Drycc Chart Repository contains everything needed to install Drycc Workflow onto a Kubernetes cluster, with a single `helm install drycc/workflow --namespace drycc --set global.platformDomain=yourdomain.com` command.
43-
44-
Add this repository to Helm:
45-
46-
```
47-
$ helm repo add drycc oci://registry.drycc.cc/charts
48-
```
49-
5040
## Install Drycc Workflow
5141

5242
If the version of helm is 3.0 +; you need to create the namespace in advance:
@@ -58,9 +48,9 @@ kubectl create ns drycc
5848
Now that Helm is installed and the repository has been added, install Workflow by running:
5949

6050
```
61-
$ helm install --namespace drycc \
62-
--set global.platformDomain=drycc.cc \
63-
drycc/workflow
51+
$ helm install drycc oci://registry.drycc.cc/charts/workflow \
52+
--namespace drycc \
53+
--set global.platformDomain=drycc.cc
6454
```
6555

6656
By default, registry uses docker hub, at present, we support three registries. They are:
@@ -72,7 +62,8 @@ By default, registry uses docker hub, at present, we support three registries. T
7262
If you want to change it, set the variable when using helm.
7363

7464
```
75-
$ helm install --namespace drycc \
65+
$ helm install drycc oci://registry.drycc.cc/charts/workflow \
66+
--namespace drycc \
7667
--set builder.imageRegistry=quay.io \
7768
--set imagebuilder.imageRegistry=quay.io \
7869
--set controller.imageRegistry=quay.io \
@@ -86,8 +77,7 @@ $ helm install --namespace drycc \
8677
--set monitor.imageRegistry=quay.io \
8778
--set registry.imageRegistry=quay.io \
8879
--set registry-proxy.imageRegistry=quay.io \
89-
--set global.platformDomain=drycc.cc \
90-
drycc/workflow
80+
--set global.platformDomain=drycc.cc
9181
```
9282

9383
Helm will install a variety of Kubernetes resources in the `drycc` namespace.

src/installing-workflow/ingress.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
Now that Helm is installed and the repository has been added, install Workflow with a native ingress by running:
66

77
```
8-
$ helm install drycc/workflow --namespace drycc \
8+
$ helm install drycc oci://registry.drycc.cc/charts/workflow \
9+
--namespace drycc \
910
--set global.ingressClass=nginx \
1011
--set global.platformDomain=drycc.cc \
1112
--set builder.service.type=LoadBalancer
1213
```
1314

1415
Of course, if you deploy it on a bare machine, you probably do not have Load Balancer. You need to use NodePort:
1516
```
16-
$ helm install drycc/workflow --namespace drycc \
17+
$ helm install drycc oci://registry.drycc.cc/charts/workflow \
18+
--namespace drycc \
1719
--set global.ingressClass=nginx \
1820
--set global.platformDomain=drycc.cc \
1921
--set builder.service.type=NodePort \
@@ -65,7 +67,10 @@ Now that Workflow has been deployed with the `global.ingressClass` , we will nee
6567
Here is an example of how to use [traefik](https://traefik.io/) as an ingress controller for Workflow. Of course, you are welcome to use any controller you wish.
6668

6769
```
68-
$ helm install stable/traefik --name ingress --namespace kube-system --set ssl.enabled=true
70+
$ helm install traefik oci://registry.drycc.cc/charts/traefik \
71+
--name ingress \
72+
--namespace kube-system \
73+
--set ssl.enabled=true
6974
```
7075

7176
## Configure DNS

src/managing-workflow/platform-logging.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ Error: There are currently no log messages. Please check the following things:
6969
By default the Fluentd pod can be configured to talk to numerous syslog endpoints. So for example it is possible to have Fluentd send log messages to both the Logger component and [Papertrail](https://papertrailapp.com/). This allows production deployments of Drycc to satisfy stringent logging requirements such as offsite backups of log data.
7070

7171
Configuring Fluentd to talk to multiple syslog endpoints means modifying the Fluentd daemonset
72-
manifest. This means you will need to fetch the chart with `helm fetch drycc/workflow --untar`, then
72+
manifest.
73+
This means you will need to fetch the chart with `helm fetch oci://registry.drycc.cc/charts/workflow --untar`, then
7374
modify `workflow/charts/fluentd/templates/logger-fluentd-daemon.yaml` with the following:
7475

7576
```

src/managing-workflow/tuning-component-settings.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@ There are a few ways to customize the respective component:
1111

1212
- If the value is exposed in the `values.yaml` file as derived above, one may modify the section of the component to tune these settings. The modified value(s) will then take effect at chart installation or release upgrade time via either of the two respective commands:
1313

14-
$ helm install drycc/workflow -n drycc --namespace drycc -f values.yaml
15-
$ helm upgrade drycc -f values.yaml
14+
$ helm install drycc oci://registry.drycc.cc/charts/workflow \
15+
-n drycc \
16+
--namespace drycc \
17+
-f values.yaml
18+
$ helm upgrade drycc oci://registry.drycc.cc/charts/workflow \
19+
-n drycc \
20+
--namespace drycc \
21+
-f values.yaml
1622

1723
- If the value hasn't yet been exposed in the `values.yaml` file, one may edit the component deployment with the tuned setting. Here we edit the `drycc-controller` deployment:
1824

@@ -22,7 +28,7 @@ There are a few ways to customize the respective component:
2228

2329
- Lastly, one may also fetch and edit the chart as served by version control/the chart repository itself:
2430

25-
$ helm fetch drycc/workflow --untar
31+
$ helm fetch oci://registry.drycc.cc/charts/workflow --untar
2632
$ $EDITOR workflow/charts/controller/templates/controller-deployment.yaml
2733

2834
Then run `helm install ./workflow --namespace drycc --name drycc` to apply the changes, or `helm upgrade drycc ./workflow` if the cluster is already running.

src/managing-workflow/upgrading-workflow.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ period of downtime while the database recovers from backup.
2121
First, find the name of the release helm gave to your deployment with `helm ls`, then run
2222

2323
```
24-
$ helm repo update
25-
$ helm upgrade <release-name> drycc/workflow
24+
$ helm upgrade <release-name> oci://registry.drycc.cc/charts/workflow
2625
```
2726

2827

0 commit comments

Comments
 (0)