You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2026/10/13 04:53:02 UTC

(skywalking-helm) 02/05: Address review: one selector style per release, quoted labels, and a stable init Job

This is an automated email from the ASF dual-hosted git repository.

wu-sheng pushed a commit to branch modernize-labels
in repository https://gitbox.apache.org/repos/asf/skywalking-helm.git

commit 678f5afa08be2d55406304e25e2ca48061e98321
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Oct 13 10:38:25 2026 +0800

    Address review: one selector style per release, quoted labels, and a stable init Job
    
    From the GPT-6 Astra review of the previous commit:
    
    - A Deployment that does not exist yet now follows the OAP Deployment instead of always taking the
      recommended labels. Enabling Satellite or the UI on a release installed before 5.1.0 used to mix
      the two styles, after which no single `deploymentSelector` value could render the release
      offline.
    - Every label value the helpers emit is quoted, so a numeric or boolean nameOverride no longer
      renders a non-string label.
    - The init Job's `app.kubernetes.io/component` is capped at 63 characters.
    - `deploymentSelector` is left out of the init Job's name hash, so setting or removing it does not
      run init again. That also lets values.yaml carry it as a real key instead of a comment.
    - The upgrade e2e cell stays on 5.0.0, the last release with legacy selectors; moving it forward
      would test something else. The release-guide step to move it is reverted. Its init Job case now
      tolerates a renamed Job, which is correct once the chart's default values drift from 5.0.0's.
---
 chart/skywalking/templates/_helpers.tpl      | 45 +++++++++++++++++++---------
 chart/skywalking/templates/oap-init.job.yaml |  6 ++--
 chart/skywalking/values.yaml                 | 13 ++++----
 docs/changes/changes.md                      |  6 ++--
 docs/contributing/e2e-tests.md               | 17 ++++++-----
 docs/contributing/release.md                 |  3 --
 docs/reference/skywalking-chart-values.md    |  2 +-
 docs/upgrade/upgrading.md                    | 11 ++++---
 test/e2e/e2e-upgrade.yaml                    | 30 +++++++++++--------
 test/e2e/expected/upgrade-init-job.yml       |  3 +-
 tools/releasing/release-passed.sh            |  2 --
 11 files changed, 82 insertions(+), 56 deletions(-)

diff --git a/chart/skywalking/templates/_helpers.tpl b/chart/skywalking/templates/_helpers.tpl
index 46232a9..166c5be 100644
--- a/chart/skywalking/templates/_helpers.tpl
+++ b/chart/skywalking/templates/_helpers.tpl
@@ -87,8 +87,8 @@ Legacy selector labels. Every pod carries them, and every selector matches on th
 Deployment selector of a release installed with 5.1.0 or later.
 */}}
 {{- define "skywalking.selectorLabels.legacy" -}}
-app: {{ include "skywalking.name" .context }}
-release: {{ .context.Release.Name }}
+app: {{ include "skywalking.name" .context | quote }}
+release: {{ .context.Release.Name | quote }}
 component: {{ default .component .legacyComponent | quote }}
 {{- end -}}
 
@@ -96,8 +96,8 @@ component: {{ default .component .legacyComponent | quote }}
 Recommended selector labels.
 */}}
 {{- define "skywalking.selectorLabels.modern" -}}
-app.kubernetes.io/name: {{ include "skywalking.appName" .context }}
-app.kubernetes.io/instance: {{ .context.Release.Name }}
+app.kubernetes.io/name: {{ include "skywalking.appName" .context | quote }}
+app.kubernetes.io/instance: {{ .context.Release.Name | quote }}
 app.kubernetes.io/component: {{ .component | quote }}
 {{- end -}}
 
@@ -115,10 +115,10 @@ Resource labels: the pod labels plus the chart and manager labels, recommended a
 */}}
 {{- define "skywalking.labels" -}}
 {{ include "skywalking.podLabels" . }}
-app.kubernetes.io/managed-by: {{ .context.Release.Service }}
-helm.sh/chart: {{ include "skywalking.chart" .context }}
-chart: {{ printf "%s-%s" .context.Chart.Name .context.Chart.Version }}
-heritage: {{ .context.Release.Service }}
+app.kubernetes.io/managed-by: {{ .context.Release.Service | quote }}
+helm.sh/chart: {{ include "skywalking.chart" .context | quote }}
+chart: {{ printf "%s-%s" .context.Chart.Name .context.Chart.Version | quote }}
+heritage: {{ .context.Release.Service | quote }}
 {{- end -}}
 
 {{/*
@@ -126,10 +126,14 @@ A Deployment's selector.
 
 Kubernetes rejects any change to a Deployment's selector after creation, so an existing Deployment
 keeps the selector it was created with: the legacy labels for a release installed before 5.1.0, the
-recommended labels for anything installed since. "auto" finds out with `lookup`. `lookup` returns
-nothing when the chart is rendered without cluster access (`helm template`, Argo CD, client-side
-`--dry-run`), so there "auto" picks the recommended labels, and an existing release rendered that way
-must set `deploymentSelector: legacy`.
+recommended labels for anything installed since. A Deployment that does not exist yet follows the
+OAP Deployment, so a release keeps one style when the UI or Satellite is enabled later, and a single
+`deploymentSelector` value always fits it. With no OAP Deployment either, it gets the recommended
+labels.
+
+"auto" finds all this out with `lookup`. `lookup` returns nothing when the chart is rendered without
+cluster access (`helm template`, Argo CD, `--dry-run=client`), so there "auto" picks the recommended
+labels, and a release installed before 5.1.0 rendered that way must set `deploymentSelector: legacy`.
 
 Takes (dict "context" $ "component" "<component>" "name" "<Deployment name>").
 */}}
@@ -139,8 +143,10 @@ Takes (dict "context" $ "component" "<component>" "name" "<Deployment name>").
 {{- fail (printf "deploymentSelector must be auto, legacy or modern, got %v" $mode) -}}
 {{- end -}}
 {{- if eq $mode "auto" -}}
-{{- $existing := lookup "apps/v1" "Deployment" .context.Release.Namespace .name -}}
-{{- $mode = ternary "legacy" "modern" (not (empty (dig "spec" "selector" "matchLabels" "release" "" $existing))) -}}
+{{- $mode = include "skywalking.existingSelectorStyle" (dict "context" .context "name" .name) -}}
+{{- if not $mode -}}
+{{- $mode = include "skywalking.existingSelectorStyle" (dict "context" .context "name" (include "skywalking.oap.fullname" .context)) -}}
+{{- end -}}
 {{- end -}}
 {{- if eq $mode "legacy" -}}
 {{ include "skywalking.selectorLabels.legacy" . }}
@@ -149,6 +155,17 @@ Takes (dict "context" $ "component" "<component>" "name" "<Deployment name>").
 {{- end -}}
 {{- end -}}
 
+{{/*
+The selector style of an existing Deployment: "legacy", "modern", or empty when it does not exist or
+the chart is rendered without cluster access. Takes (dict "context" $ "name" "<Deployment name>").
+*/}}
+{{- define "skywalking.existingSelectorStyle" -}}
+{{- $existing := lookup "apps/v1" "Deployment" .context.Release.Namespace .name -}}
+{{- if $existing -}}
+{{- ternary "legacy" "modern" (not (empty (dig "spec" "selector" "matchLabels" "release" "" $existing))) -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified ui name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
diff --git a/chart/skywalking/templates/oap-init.job.yaml b/chart/skywalking/templates/oap-init.job.yaml
index 1d8f748..0105dc5 100644
--- a/chart/skywalking/templates/oap-init.job.yaml
+++ b/chart/skywalking/templates/oap-init.job.yaml
@@ -29,9 +29,11 @@ metadata:
   # The name carries a hash of the chart values: a Job's `spec.template` is immutable, so a stable
   # name would make `helm upgrade` fail with "field is immutable" whenever the pod template changes.
   # Hashing yields a fresh Job whenever a relevant value changes; Helm prunes the previous one.
-  name: "{{ printf "%s-init-%s" (include "skywalking.oap.fullname" . | trunc 40 | trimSuffix "-") (.Values | toYaml | sha256sum | trunc 8) }}"
+  # `deploymentSelector` is left out of the hash: it only chooses label keys, so setting or removing
+  # it must not run init again.
+  name: "{{ printf "%s-init-%s" (include "skywalking.oap.fullname" . | trunc 40 | trimSuffix "-") (omit .Values "deploymentSelector" | toYaml | sha256sum | trunc 8) }}"
   labels:
-    {{- include "skywalking.labels" (dict "context" . "component" (printf "%s-init" .Values.oap.name) "legacyComponent" (printf "%s-job" (include "skywalking.fullname" .))) | nindent 4 }}
+    {{- include "skywalking.labels" (dict "context" . "component" (printf "%s-init" .Values.oap.name | trunc 63 | trimSuffix "-") "legacyComponent" (printf "%s-job" (include "skywalking.fullname" .))) | nindent 4 }}
 spec:
   {{- if .Values.oapInit.ttlSecondsAfterFinished }}
   ttlSecondsAfterFinished: {{ .Values.oapInit.ttlSecondsAfterFinished }}
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 37a2331..0448741 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -612,14 +612,13 @@ fullnameOverride: ""
 
 # Which labels the OAP, UI and Satellite Deployments select their pods by. Kubernetes never lets a
 # Deployment's selector change, so it is fixed when the Deployment is created.
-#   auto:   keep the selector an existing Deployment already has, and use the recommended
-#           app.kubernetes.io/* labels for a new one. Releases installed before 5.1.0 keep the
-#           legacy app/release/component labels.
+#   auto:   keep the selector an existing Deployment already has. A new Deployment follows the
+#           OAP Deployment, or gets the recommended app.kubernetes.io/* labels in a new release.
+#           Releases installed before 5.1.0 keep the legacy app/release/component labels.
 #   legacy: always the legacy labels. Required for a release installed before 5.1.0 when the chart
 #           is rendered without cluster access (Argo CD, `helm template | kubectl apply`), because
 #           "auto" cannot see the existing Deployments there and would pick the recommended labels.
 #   modern: always the recommended labels.
-# Pods carry both label sets either way, and Services keep selecting by the legacy labels.
-# Commented out on purpose: the init Job's name hashes the values, so a new default key here would
-# re-run the init Job on every upgrade to this chart version. Unset means "auto".
-# deploymentSelector: auto
+# Pods carry both label sets either way, and Services keep selecting by the legacy labels. The
+# value is left out of the init Job's name hash, so changing it does not run init again.
+deploymentSelector: auto
diff --git a/docs/changes/changes.md b/docs/changes/changes.md
index 604e0e4..8719803 100644
--- a/docs/changes/changes.md
+++ b/docs/changes/changes.md
@@ -22,11 +22,13 @@
   an upgrade relabels the existing Job in place instead of re-running init.
 - **New installs select pods by the recommended labels.** A Deployment's selector cannot change
   after creation, so the chart chooses it per install. A fresh install uses `app.kubernetes.io/*`,
-  and an upgrade keeps the selector the existing Deployment already has. Services, OAP cluster
+  and an upgrade keeps the selector the existing Deployment already has. A Deployment created later,
+  such as Satellite enabled on an existing release, follows the OAP Deployment. Services, OAP cluster
   discovery and Satellite's OAP lookup keep the old labels, which every pod carries. To move an
   existing release to the new selectors, delete the OAP, UI and Satellite Deployments and upgrade;
   see [Upgrade](../upgrade/upgrading.md#deployment-selectors-and-recommended-labels).
-  `deploymentSelector` (`auto`, `legacy`, `modern`) overrides the detection.
+  `deploymentSelector` (`auto`, `legacy`, `modern`) overrides the detection; it is left out of the
+  init Job's name hash, so changing it does not run init again.
 - A new E2E cell, `e2e-upgrade.yaml`, installs the published 5.0.0 chart and upgrades it to the
   working tree with identical values. The other cells only install fresh, so nothing tested the
   path every existing user takes.
diff --git a/docs/contributing/e2e-tests.md b/docs/contributing/e2e-tests.md
index 125464c..950eecf 100644
--- a/docs/contributing/e2e-tests.md
+++ b/docs/contributing/e2e-tests.md
@@ -87,25 +87,28 @@ The fifth case checks that a fresh install's Deployments select their pods by th
 
 Every other cell installs fresh, so it only ever sees objects this chart created. This one takes the
 path every existing user takes: it installs the last published chart from
-`oci://docker.io/apache/skywalking-helm` (`CHART_FROM` in the file), then runs `helm upgrade` to the
+`oci://docker.io/apache/skywalking-helm` (`CHART_FROM` in the file, `5.0.0`), then runs `helm upgrade` to the
 working tree with **identical** values, on BanyanDB standalone with Satellite enabled.
 
 An upgrade can fail where a fresh install passes, on fields Kubernetes never lets change. A
 Deployment's selector is one: releases installed before 5.1.0 select by `app`/`release`/`component`,
 and the chart has to keep that selector or the upgrade fails with `field is immutable`. The init
-Job's pod template is the other: with identical values the Job keeps its name, so Helm patches the
-existing Job, and any chart change to its pod template fails the upgrade the same way. The values
-are identical in both `helm` commands on purpose, because different values would rename the Job and
-hide this.
+Job's pod template is the other: while the chart's default values match `CHART_FROM`'s, identical
+values keep the Job's name, so Helm patches the existing Job, and any chart change to its pod
+template fails the upgrade the same way. The values are identical in both `helm` commands on
+purpose, because different values would rename the Job and hide this.
 
 | Case | Asserts |
 | --- | --- |
 | Deployment selectors | All three still select by `app`, `release` and `component` |
 | Pod labels | The rolled pods of all three carry the `app.kubernetes.io/*` labels |
-| Init Job | One Job, the same object as before the upgrade, relabelled with `app.kubernetes.io/component: oap-init` |
+| Init Job | One succeeded Job with `app.kubernetes.io/component: oap-init`; if it kept its name, it is the same object as before the upgrade |
 | Login and OAP reachability | Traffic still reaches the pods through the Services |
 
-Move `CHART_FROM` to each new release once it is published.
+`CHART_FROM` stays at `5.0.0`, the last release whose Deployments select by the legacy labels. A
+release installed with 5.1.0 or later selects by the recommended labels, so a later `CHART_FROM`
+would test something else and fail `expected/upgrade-selectors.yml`. Upgrading from the latest
+release is a different test; add it as its own cell.
 
 ### There are no OAP 10.4 cells
 
diff --git a/docs/contributing/release.md b/docs/contributing/release.md
index c947fa6..ec8d35d 100644
--- a/docs/contributing/release.md
+++ b/docs/contributing/release.md
@@ -492,9 +492,6 @@ It prints this list at the end; the detail is here.
 3. **Milestones** — close `$VERSION` here and `Helm - $VERSION` on `apache/skywalking`, and open the
    next pair.
 4. **The next development version** — bump `version:` in `chart/skywalking/Chart.yaml`.
-5. **The upgrade E2E cell** — once the chart is on `oci://docker.io/apache/skywalking-helm`, move
-   `CHART_FROM` in `test/e2e/e2e-upgrade.yaml` to `$VERSION`, so the cell upgrades from this release.
-   See [Run the E2E Tests](e2e-tests.md#the-fifth-cell-e2e-upgradeyaml).
 
 ## `make publish` — the manual fallback
 
diff --git a/docs/reference/skywalking-chart-values.md b/docs/reference/skywalking-chart-values.md
index fbffd45..5625f0f 100644
--- a/docs/reference/skywalking-chart-values.md
+++ b/docs/reference/skywalking-chart-values.md
@@ -56,7 +56,7 @@ The following table lists the configurable parameters of the Skywalking chart an
 |----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|
 | `nameOverride`                         | Override the chart name used in resource names and the `app.kubernetes.io/name` label                                                                                                                                                                                                                                                                           | `""`                                                                                            [...]
 | `fullnameOverride`                     | Override the full resource-name prefix outright (the e2e tests set this to `skywalking`)                                                                                                                                                                                                                                    | `""`                                                                                                                     |
-| `deploymentSelector`                   | Labels the OAP, UI and Satellite Deployments select their pods by, fixed when each Deployment is created. `auto` keeps an existing Deployment's selector and gives a new one the `app.kubernetes.io/*` labels. `legacy` always uses `app`/`release`/`component`, and is required for a release installed before 5.1.0 that is rendered without cluster access, such as by Argo CD. `modern` always uses `app.kubernetes.io/*`. See [Upgrade](../upgrade/upgrading [...]
+| `deploymentSelector`                   | Labels the OAP, UI and Satellite Deployments select their pods by, fixed when each Deployment is created. `auto` keeps an existing Deployment's selector; a new Deployment follows the OAP Deployment, or gets the `app.kubernetes.io/*` labels in a new release. `legacy` always uses `app`/`release`/`component`, and is required for a release installed before 5.1.0 that is rendered without cluster access, such as by Argo CD. `modern` always uses `app.k [...]
 | `initContainer.image`                  | Image for the chart's `wait-for-storage` init container                                                                                                                                                                                                                                                                    | `busybox`                                                                                                                |
 | `initContainer.tag`                    | Tag for the `wait-for-storage` init container image                                                                                                                                                                                                                                                                        | `1.30`                                                                                                                   |
 | `serviceAccounts.oap.create`           | Create of the OAP service account                                                                                                                                                                                                                                                                                          | `true`                                                                                                                   |
diff --git a/docs/upgrade/upgrading.md b/docs/upgrade/upgrading.md
index 93fd80a..0c4516d 100644
--- a/docs/upgrade/upgrading.md
+++ b/docs/upgrade/upgrading.md
@@ -50,7 +50,9 @@ created:
 | Installed before 5.1.0, upgraded with `helm upgrade` | `app`, `release`, `component`, unchanged |
 
 `helm upgrade` needs no extra step. The chart looks the existing Deployments up with Helm's `lookup`
-and keeps their selector; the pods roll once to pick up the new labels. The OAP init Job gets the new
+and keeps their selector; the pods roll once to pick up the new labels. A Deployment that does not
+exist yet, such as Satellite enabled on an existing release, takes the OAP Deployment's selector, so
+one release never mixes the two. The OAP init Job gets the new
 labels on the Job only, so an upgrade with unchanged values relabels it in place and does not run init
 again.
 
@@ -64,8 +66,8 @@ kubectl get deployment -n skywalking -l release=skywalking \
 ### Argo CD and other tools that render without cluster access
 
 `lookup` returns nothing when the chart is rendered without cluster access: Argo CD,
-`helm template | kubectl apply`, and client-side `helm upgrade --dry-run`. There the chart cannot see
-the existing Deployments and renders the new selector. For a release installed before 5.1.0, set:
+`helm template | kubectl apply`, and `helm upgrade --dry-run=client`. There the chart cannot see the
+existing Deployments and renders the new selector. For a release installed before 5.1.0, set:
 
 ```yaml
 deploymentSelector: legacy
@@ -73,7 +75,8 @@ deploymentSelector: legacy
 
 Without it, the sync fails on the three Deployments with `spec.selector: ... field is immutable`. The
 running pods and the Services are not touched, so nothing goes down: set the value and sync again. A
-release first installed with 5.1.0 or later needs nothing.
+release first installed with 5.1.0 or later needs nothing. The value is left out of the init Job's
+name hash, so setting or removing it does not run init again.
 
 For the same reason, a preview rendered without cluster access shows the new selector for an
 existing release, although the real upgrade keeps the old one. `helm upgrade --dry-run=server`
diff --git a/test/e2e/e2e-upgrade.yaml b/test/e2e/e2e-upgrade.yaml
index 05ead93..3de8b4f 100644
--- a/test/e2e/e2e-upgrade.yaml
+++ b/test/e2e/e2e-upgrade.yaml
@@ -24,16 +24,18 @@
 #     pods by app/release/component. The chart has to look the existing
 #     Deployments up and keep that selector, or `helm upgrade` fails with
 #     "field is immutable".
-#   - The init Job's pod template. With identical values the Job keeps its
-#     name, so Helm patches the existing Job, and any chart change to its pod
-#     template fails the upgrade the same way. The values are identical in both
-#     helm commands on purpose: different values would rename the Job and hide
-#     this.
+#   - The init Job's pod template. While the chart's default values match
+#     CHART_FROM's, identical values keep the Job's name, so Helm patches the
+#     existing Job, and any chart change to its pod template fails the upgrade
+#     the same way. The values are identical in both helm commands on purpose:
+#     different values would rename the Job and hide this.
 #
 # Deliberately cheap, like e2e-config-override.yaml: no Istio, no traffic.
 #
-# CHART_FROM is the published chart this cell upgrades from. Move it to each new
-# release once that release is published.
+# CHART_FROM stays at 5.0.0, the last release whose Deployments select by the
+# legacy labels. A release installed with 5.1.0 or later selects by the
+# recommended labels, so a later CHART_FROM would test something else and fail
+# expected/upgrade-selectors.yml.
 
 setup:
   env: kind
@@ -77,9 +79,9 @@ setup:
         )
         helm install skywalking oci://docker.io/apache/skywalking-helm --version "$CHART_FROM" \
           "${args[@]}" --wait --wait-for-jobs --timeout 15m
-        # Recorded for the verify phase: the same Job must still be there after the upgrade.
-        kubectl -n default get job -l release=skywalking -o jsonpath='{.items[0].metadata.uid}' \
-          > /tmp/skywalking-helm-e2e-init-job-uid
+        # Recorded for the verify phase: a Job that kept its name must be the same object.
+        kubectl -n default get job -l release=skywalking \
+          -o jsonpath='{.items[0].metadata.name} {.items[0].metadata.uid}' > /tmp/skywalking-helm-e2e-init-job
         helm upgrade skywalking chart/skywalking "${args[@]}" --wait --wait-for-jobs --timeout 15m
       wait:
         - namespace: default
@@ -109,10 +111,12 @@ verify:
         kubectl -n default get pods -l app.kubernetes.io/name=skywalking-helm,app.kubernetes.io/instance=skywalking -o json | yq -p json -o yaml '{"components": ([.items[] | select(.status.phase == "Running") | .metadata.labels."app.kubernetes.io/component"] | unique | sort)}'
       expected: expected/upgrade-pods-relabelled.yml
 
-    # The init Job was relabelled in place, not replaced: same object, new
-    # labels, and init did not run again.
+    # The init Job carries the new labels, and a Job that kept its name was
+    # relabelled in place rather than replaced, so init did not run again. If
+    # the chart's default values ever drift from CHART_FROM's, the Job gets a
+    # new name instead, which is also correct.
     - query: |
-        uid=$(cat /tmp/skywalking-helm-e2e-init-job-uid); kubectl -n default get job -l release=skywalking -o json | yq -p json -o yaml "{\"jobs\": (.items | length), \"sameJob\": (.items[0].metadata.uid == \"$uid\"), \"component\": .items[0].metadata.labels.\"app.kubernetes.io/component\"}"
+        read -r name uid < /tmp/skywalking-helm-e2e-init-job; kubectl -n default get job -l release=skywalking -o json | yq -p json -o yaml "{\"jobs\": (.items | length), \"succeeded\": .items[0].status.succeeded, \"component\": .items[0].metadata.labels.\"app.kubernetes.io/component\", \"inPlace\": (.items[0].metadata.name != \"$name\" or .items[0].metadata.uid == \"$uid\")}"
       expected: expected/upgrade-init-job.yml
 
     # Traffic still reaches the pods through the Services, which kept selecting
diff --git a/test/e2e/expected/upgrade-init-job.yml b/test/e2e/expected/upgrade-init-job.yml
index 34f2018..13c7efe 100644
--- a/test/e2e/expected/upgrade-init-job.yml
+++ b/test/e2e/expected/upgrade-init-job.yml
@@ -14,5 +14,6 @@
 # limitations under the License.
 
 jobs: 1
-sameJob: true
+succeeded: 1
 component: oap-init
+inPlace: true
diff --git a/tools/releasing/release-passed.sh b/tools/releasing/release-passed.sh
index a70125a..f132ba0 100755
--- a/tools/releasing/release-passed.sh
+++ b/tools/releasing/release-passed.sh
@@ -305,8 +305,6 @@ remaining() {
   log "     from your @apache.org address, with the vote permalink filled in"
   log "3. close the 5.0.0 milestone here and 'Helm - ${VERSION}' on apache/skywalking"
   log "4. the next-version PR was opened by release.sh; merge it if you have not already"
-  log "5. once the chart is on oci://docker.io/apache/skywalking-helm, move CHART_FROM in"
-  log "     test/e2e/e2e-upgrade.yaml to ${VERSION}, so the upgrade cell starts from this release"
 }
 
 # ---------------------------------------------------------------------------