feat(workflow): switch charts to oci

duanhongyi · duanhongyi · commit 340e4ffd3d23 · 2022-09-01T20:54:10.000+08:00
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -35,17 +35,19 @@ steps:
 - name: publish-charts
   commands:
   - pip install -r requirements.txt
-  - python3 _scripts/dependency_update.py "$CHARTMUSEUM_API/$([ -z $DRONE_TAG ] && echo testing || echo stable)" "charts/workflow/Chart.yaml" 
-  - helm package charts/workflow -u --version ${DRONE_TAG:-v1.0.0}
-  - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@workflow-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
+  - python3 _scripts/dependency_update.py "oci://$DRYCC_REGISTRY/$([ -z $DRONE_TAG ] && echo charts-testing || echo charts)" "charts/workflow/Chart.yaml" 
+  - helm dependency update charts/workflow
+  - helm package charts/workflow -u --version $([ -z $DRONE_TAG ] && echo 1.0.0 || echo ${DRONE_TAG#v})
+  - echo $CONTAINER_PASSWORD | helm registry login $DRYCC_REGISTRY -u $CONTAINER_USERNAME --password-stdin
+  - helm push workflow-$([ -z $DRONE_TAG ] && echo 1.0.0 || echo ${DRONE_TAG#v}).tgz oci://$DRYCC_REGISTRY/$([ -z $DRONE_TAG ] && echo charts-testing || echo charts)
   - bash _scripts/generate_cache.sh 
   environment:
-    CHARTMUSEUM_API:
-      from_secret: chartmuseum_api
-    CHARTMUSEUM_USERNAME:
-      from_secret: chartmuseum_username
-    CHARTMUSEUM_PASSWORD:
-      from_secret: chartmuseum_password
+    DRYCC_REGISTRY:
+      from_secret: drycc_registry
+    CONTAINER_USERNAME:
+      from_secret: container_username
+    CONTAINER_PASSWORD:
+      from_secret: container_password
 
 trigger:
   event:
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,8 @@ lib
 lib64
 bower_components
 .sass-cache
+charts/workflow/charts
+charts/workflow/Chart.lock
 
 # python virtual environments for testing
 venv/
@@ -23,4 +25,4 @@ _build/
 
 .DS_Store
 .idea/*
-.vscode/
+.vscode/
diff --git a/_scripts/dependency_update.py b/_scripts/dependency_update.py
@@ -16,16 +16,12 @@ def dump_requirements(requirements_file, requirements):
     with open(requirements_file, "w") as f:
         return yaml.dump(requirements, stream=f, Dumper=yaml.Dumper)
 
-def update_dependencies(index, requirements, url):
+def update_dependencies(requirements, url):
     for dependency in requirements["dependencies"]:
-        entries = index["entries"][dependency["name"]]
-        entries.sort(key=lambda x: x["created"])
-        dependency["version"] = entries[-1]["version"]
         dependency["repository"] = url
 
 if __name__ == "__main__":
-    index = load_index(sys.argv[1] + "/index.yaml")
     requirements = load_requirements(sys.argv[2])
-    update_dependencies(index, requirements, sys.argv[1])
+    update_dependencies(requirements, sys.argv[1])
     dump_requirements(sys.argv[2], requirements)
 
diff --git a/_scripts/generate_cache.sh b/_scripts/generate_cache.sh
@@ -25,5 +25,5 @@ helm fetch jetstack/cert-manager
 
 for tar in `ls $tmp | grep .tgz`
 do
-    curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@$tar "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
+    helm push $tar oci://$DRYCC_REGISTRY/$([ -z $DRONE_TAG ] && echo charts-testing || echo charts)
 done
diff --git a/_scripts/install.sh b/_scripts/install.sh
@@ -59,7 +59,7 @@ function install_helm {
   tar -zxvf "${tar_name}"
   mv "linux-${ARCH}/helm" /usr/local/bin/helm
   rm -rf "${tar_name}" "linux-${ARCH}"
-  helm repo add --force-update drycc https://charts.drycc.cc/${CHANNEL:-stable}
+  helm repo add --force-update drycc oci://registry.drycc.cc/$([ $CHANNEL == "stable" ] && echo charts || echo charts-testing)
   helm repo update
 }
 
diff --git a/charts/workflow/Chart.yaml b/charts/workflow/Chart.yaml
@@ -1,51 +1,51 @@
-name: workflow
 apiVersion: v2
-home: https://github.com/drycc/workflow
 dependencies:
 - name: builder
-  version: <builder-tag>
-  repository: https://charts.drycc.cc/stable/builder
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: imagebuilder
-  version: <imagebuilder-tag>
-  repository: https://charts.drycc.cc/stable/imagebuilder
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: controller
-  version: <controller-tag>
-  repository: https://charts.drycc.cc/stable/controller
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: database
-  version: <database-tag>
-  repository: https://charts.drycc.cc/stable/database
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: fluentd
-  version: <fluentd-tag>
-  repository: https://charts.drycc.cc/stable/fluentd
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: redis
-  version: <redis-tag>
-  repository: https://charts.drycc.cc/stable/redis
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: logger
-  version: <logger-tag>
-  repository: https://charts.drycc.cc/stable/logger
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: storage
-  version: <storage-tag>
-  repository: https://charts.drycc.cc/stable/storage
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: monitor
-  version: <monitor-tag>
-  repository: https://charts.drycc.cc/stable/monitor
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: registry
-  version: <registry-tag>
-  repository: https://charts.drycc.cc/stable/registry
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: registry-proxy
-  version: <registry-proxy-tag>
-  repository: https://charts.drycc.cc/stable/registry-proxy
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: influxdb
-  version: <influxdb-tag>
-  repository: https://charts.drycc.cc/stable/influxdb
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: rabbitmq
-  version: <rabbitmq-tag>
-  repository: https://charts.drycc.cc/stable/rabbitmq
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 - name: passport
-  version: <passport-tag>
-  repository: https://charts.drycc.cc/stable/passport
+  repository: oci://registry.drycc.cc/charts-testing
+  version: x.x.x
 description: Drycc Workflow
+home: https://github.com/drycc/workflow
 maintainers:
-- name: Team Drycc
-  email: team@drycc.cc
+- email: team@drycc.cc
+  name: Team Drycc
+name: workflow
 version: v1.0.0
diff --git a/src/_includes/install-workflow.md b/src/_includes/install-workflow.md
@@ -17,7 +17,7 @@ The Drycc Chart Repository contains everything needed to install Drycc Workflow
 Add this repository to Helm:
 
 ```
-$ helm repo add drycc https://charts.drycc.cc/stable
+$ helm repo add drycc oci://registry.drycc.cc/charts
 ```
 
 ## Install Drycc Workflow
diff --git a/src/installing-workflow/configuring-object-storage.md b/src/installing-workflow/configuring-object-storage.md
@@ -29,7 +29,7 @@ If you are using AWS S3 and your Kubernetes nodes are configured with appropriat
 
 ### Step 3: Add Drycc Repo
 
-If you haven't already added the Helm repo, do so with `helm repo add drycc https://charts.drycc.cc/stable`
+If you haven't already added the Helm repo, do so with `helm repo add drycc oci://registry.drycc.cc/charts`
 
 ### Step 4: Configure Workflow Chart
 
diff --git a/src/installing-workflow/index.md b/src/installing-workflow/index.md
@@ -44,7 +44,7 @@ The Drycc Chart Repository contains everything needed to install Drycc Workflow
 Add this repository to Helm:
 
 ```
-$ helm repo add drycc https://charts.drycc.cc/stable
+$ helm repo add drycc oci://registry.drycc.cc/charts
 ```
 
 ## Install Drycc Workflow
diff --git a/src/roadmap/releases.md b/src/roadmap/releases.md
@@ -134,7 +134,7 @@ this chart will also be packaged, signed and uploaded to its production chart re
 verify it can be fetched (and verified):
 
 ```
-$ helm repo add controller https://charts.drycc.cc/stable
+$ helm repo add controller oci://registry.drycc.cc/charts
 "controller" has been added to your repositories
 $ helm fetch --verify drycc/controller --version v1.0.1
 Verification: &{0xc4207ec870 sha256:026e766e918ff28d2a7041bc3d560d149ee7eb0cb84165c9d9d00a3045ff45c3 controller-v1.0.1.tgz}
@@ -209,7 +209,7 @@ the chart versions existing in the `WORKFLOW_PREV_RELEASE` chart and the _most r
 (Therefore, if there are any unreleased commits in a component repo, they will not appear here):
 
 ```bash
-helm repo add drycc https://charts.drycc.cc/stable
+helm repo add drycc oci://registry.drycc.cc/charts
 helm fetch --untar drycc/workflow --version $WORKFLOW_PREV_RELEASE
 dryccrel changelog global workflow/requirements.lock map.json > changelog-$WORKFLOW_RELEASE.md
 ```

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ function install_helm {`
`59`	`59`	`tar -zxvf "${tar_name}"`
`60`	`60`	`mv "linux-${ARCH}/helm" /usr/local/bin/helm`
`61`	`61`	`rm -rf "${tar_name}" "linux-${ARCH}"`
`62`		`- helm repo add --force-update drycc https://charts.drycc.cc/${CHANNEL:-stable}`
	`62`	`+ helm repo add --force-update drycc oci://registry.drycc.cc/$([ $CHANNEL == "stable" ] && echo charts \|\| echo charts-testing)`
`63`	`63`	`helm repo update`
`64`	`64`	`}`
`65`	`65`