You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mb...@apache.org on 2022/03/30 13:50:53 UTC
[flink-kubernetes-operator] branch release-0.1 updated: [FLINK-26924] Rename docker image and helm chart to flink-kubernetes-operator
This is an automated email from the ASF dual-hosted git repository.
mbalassi pushed a commit to branch release-0.1
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/release-0.1 by this push:
new 7cfec00 [FLINK-26924] Rename docker image and helm chart to flink-kubernetes-operator
7cfec00 is described below
commit 7cfec00c3ba91a45798629cfb669c0cfe0574d4c
Author: Márton Balassi <ma...@apple.com>
AuthorDate: Wed Mar 30 15:49:19 2022 +0200
[FLINK-26924] Rename docker image and helm chart to flink-kubernetes-operator
---
.github/workflows/ci.yml | 12 +++++------
.github/workflows/docker_push.yml | 2 +-
docs/content/docs/development/guide.md | 18 ++++++++--------
docs/content/docs/operations/helm.md | 12 +++++------
docs/content/docs/operations/metrics-logging.md | 6 +++---
.../try-flink-kubernetes-operator/quick-start.md | 10 ++++-----
flink-kubernetes-operator/pom.xml | 2 +-
.../operator/metrics/OperatorMetricUtils.java | 3 ++-
.../metrics/KubernetesOperatorMetricGroupTest.java | 25 +++++++++++++++-------
.../.helmignore | 0
.../Chart.yaml | 4 ++--
.../conf/flink-default-config/flink-conf.yaml | 0
.../flink-default-config/log4j-console.properties | 0
.../conf/flink-operator-config/flink-conf.yaml | 0
.../conf/flink-operator-config/log4j2.properties | 0
.../crds/flinkdeployments.flink.apache.org-v1.yml | 0
.../templates/_helpers.tpl | 0
.../templates/flink-operator.yaml | 0
.../templates/rbac.yaml | 0
.../templates/serviceaccount.yaml | 0
.../templates/webhook.yaml | 0
.../values.yaml | 2 +-
pom.xml | 2 +-
tools/releasing/create_source_release.sh | 10 ++++-----
tools/releasing/update_branch_version.sh | 4 ++--
25 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cab3619..f6ae030 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,8 +60,8 @@ jobs:
docker images
- name: Start the operator
run: |
- helm install flink-operator helm/flink-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest
- kubectl wait --for=condition=Available --timeout=120s deploy/flink-operator
+ helm install flink-kubernetes-operator helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest
+ kubectl wait --for=condition=Available --timeout=120s deploy/flink-kubernetes-operator
kubectl get pods
- name: Tests in flink-kubernetes-operator
run: |
@@ -75,7 +75,7 @@ jobs:
cd ..
- name: Stop the operator
run: |
- helm uninstall flink-operator
+ helm uninstall flink-kubernetes-operator
- name: Stop minikube
run: |
source e2e-tests/utils.sh
@@ -124,8 +124,8 @@ jobs:
docker images
- name: Start the operator
run: |
- helm install flink-operator -n ${{ matrix.config.namespace }} helm/flink-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest ${{ matrix.config.extraArgs }}
- kubectl wait --for=condition=Available --timeout=120s -n ${{ matrix.config.namespace }} deploy/flink-operator
+ helm install flink-kubernetes-operator -n ${{ matrix.config.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest ${{ matrix.config.extraArgs }}
+ kubectl wait --for=condition=Available --timeout=120s -n ${{ matrix.config.namespace }} deploy/flink-kubernetes-operator
kubectl get pods
- name: Run Flink e2e tests
run: |
@@ -135,7 +135,7 @@ jobs:
done
- name: Stop the operator
run: |
- helm uninstall -n ${{ matrix.config.namespace }} flink-operator
+ helm uninstall -n ${{ matrix.config.namespace }} flink-kubernetes-operator
- name: Stop minikube
run: |
source e2e-tests/utils.sh
diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml
index 709d247..9cc3c57 100644
--- a/.github/workflows/docker_push.yml
+++ b/.github/workflows/docker_push.yml
@@ -54,7 +54,7 @@ jobs:
uses: docker/metadata-action@v3
with:
images: |
- ghcr.io/${{ github.repository_owner }}/flink-operator
+ ghcr.io/${{ github.repository }}
tags: |
type=raw,value=main,enable=${{ github.ref == 'refs/heads/main' }}
type=sha,prefix=,format=short
diff --git a/docs/content/docs/development/guide.md b/docs/content/docs/development/guide.md
index a688415..643aa29 100644
--- a/docs/content/docs/development/guide.md
+++ b/docs/content/docs/development/guide.md
@@ -37,20 +37,20 @@ and [helm](https://helm.sh/docs/intro/quickstart/) on your local machine. For th
### Building docker images
You can build your own flavor of image as follows via specifying your `<repo>`:
```bash
-docker build . -t <repo>/flink-operator:latest
-docker push <repo>/flink-operator:latest
+docker build . -t <repo>/flink-kubernetes-operator:latest
+docker push <repo>/flink-kubernetes-operator:latest
```
If you are using minikube you might want to load the image directly instead of pushing it to a registry:
```bash
-minikube image load <repo>/flink-operator:latest
+minikube image load <repo>/flink-kubernetes-operator:latest
```
You can cut a corner via using the docker daemon of your minikube installation directly as follows:
```bash
eval $(minikube docker-env)
-DOCKER_BUILDKIT=1 docker build . -t <repo>/flink-operator:latest
+DOCKER_BUILDKIT=1 docker build . -t <repo>/flink-kubernetes-operator:latest
```
When you want to reset your environment to the defaults you can do the following:
@@ -66,13 +66,13 @@ minikube ssh
Last login: Wed Mar 9 10:01:21 2022 from 192.168.49.1
docker@minikube:~$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
-flink-operator latest cf7856d9ef59 23 hours ago 578MB
+flink-kubernetes-operator latest cf7856d9ef59 23 hours ago 578MB
docker@minikube:~$ exit
```
### Installing the operator locally
```bash
-helm install flink-operator helm/flink-operator --set image.repository=<repo>/flink-operator --set image.tag=latest
+helm install flink-kubernetes-operator helm/flink-kubernetes-operator --set image.repository=<repo>/flink-kubernetes-operator --set image.tag=latest
```
### Running the operator locally
You can run or debug the `FlinkOperator` from your preferred IDE. The operator itself is accessing the deployed Flink clusters through the REST interface. When running locally the `rest.port` and `rest.address` Flink configuration parameters must be modified to a locally accessible value.
@@ -95,14 +95,14 @@ rest.address: localhost
### Uninstalling the operator locally
```bash
-helm uninstall flink-operator
+helm uninstall flink-kubernetes-operator
```
### Generating and Upgrading the CRD
By default, the CRD is generated by the [Fabric8 CRDGenerator](https://github.com/fabric8io/kubernetes-client/blob/master/doc/CRD-generator.md), when building from source.
-When installing flink-operator for the first time, the CRD will be applied to the kubernetes cluster automatically. But it will not be removed or upgraded when re-installing the flink-operator, as described in the relevant helm [documentation](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/).
-So if the CRD is changed, you have to delete the CRD resource manually, and re-install the flink-operator.
+When installing flink-kubernetes-operator for the first time, the CRD will be applied to the kubernetes cluster automatically. But it will not be removed or upgraded when re-installing the flink-kubernetes-operator, as described in the relevant helm [documentation](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/).
+So if the CRD is changed, you have to delete the CRD resource manually, and re-install the flink-kubernetes-operator.
```bash
kubectl delete crd flinkdeployments.flink.apache.org
diff --git a/docs/content/docs/operations/helm.md b/docs/content/docs/operations/helm.md
index 8968ce4..d5c98fc 100644
--- a/docs/content/docs/operations/helm.md
+++ b/docs/content/docs/operations/helm.md
@@ -29,13 +29,13 @@ under the License.
The operator installation is managed by a helm chart. To install run:
```
-helm install flink-operator helm/flink-operator
+helm install flink-kubernetes-operator helm/flink-kubernetes-operator
```
Alternatively to install the operator (and also the helm chart) to a specific namespace:
```
-helm install flink-operator helm/flink-operator --namespace flink-operator --create-namespace
+helm install flink-kubernetes-operator helm/flink-kubernetes-operator --namespace flink --create-namespace
```
Note that in this case you will need to update the namespace in the examples accordingly or the `default`
@@ -66,12 +66,12 @@ The recommended solution is to split the operator into two Argo apps, such as:
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
- name: flink-operator-crds
+ name: flink-kubernetes-operator-crds
spec:
source:
repoURL: https://github.com/apache/flink-kubernetes-operator
targetRevision: main
- path: helm/flink-operator/crds
+ path: helm/flink-kubernetes-operator/crds
syncOptions:
- Replace=true
...
@@ -83,12 +83,12 @@ spec:
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
- name: flink-operator-skip-crds
+ name: flink-kubernetes-operator-skip-crds
spec:
source:
repoURL: https://github.com/apache/flink-kubernetes-operator
targetRevision: main
- path: helm/flink-operator
+ path: helm/flink-kubernetes-operator
helm:
skipCrds: true
...
diff --git a/docs/content/docs/operations/metrics-logging.md b/docs/content/docs/operations/metrics-logging.md
index d5b0f3e..3fb31bd 100644
--- a/docs/content/docs/operations/metrics-logging.md
+++ b/docs/content/docs/operations/metrics-logging.md
@@ -76,13 +76,13 @@ To enable the operator metrics in Prometheus create a `pod-monitor.yaml` file wi
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
- name: flink-operator
+ name: flink-kubernetes-operator
labels:
release: prometheus
spec:
selector:
matchLabels:
- app.kubernetes.io/name: flink-operator
+ app.kubernetes.io/name: flink-kubernetes-operator
podMetricsEndpoints:
- port: metrics
```
@@ -93,7 +93,7 @@ kubectl create -f pod-monitor.yaml
Once the custom resource is created in the Kubernetes environment the operator metrics are ready to explore [http://localhost:3000/explore](http://localhost:3000/explore).
# Logging
-The Operator controls the logging behaviour for Flink applications and the Operator itself using configuration files mounted externally via ConfigMaps. [Configuration files](https://github.com/apache/flink-kubernetes-operator/tree/main/helm/flink-operator/conf) with default values are shipped in the Helm chart. It is recommended to review and adjust them if needed in the `values.yaml` file before deploying the Operator in production environments.
+The Operator controls the logging behaviour for Flink applications and the Operator itself using configuration files mounted externally via ConfigMaps. [Configuration files](https://github.com/apache/flink-kubernetes-operator/tree/main/helm/flink-kubernetes-operator/conf) with default values are shipped in the Helm chart. It is recommended to review and adjust them if needed in the `values.yaml` file before deploying the Operator in production environments.
To append/override the default log configuration properties for the Operator use:
```yaml
diff --git a/docs/content/docs/try-flink-kubernetes-operator/quick-start.md b/docs/content/docs/try-flink-kubernetes-operator/quick-start.md
index 3050d53..871fe96 100644
--- a/docs/content/docs/try-flink-kubernetes-operator/quick-start.md
+++ b/docs/content/docs/try-flink-kubernetes-operator/quick-start.md
@@ -72,11 +72,11 @@ cd flink-kubernetes-operator
You can build the docker image of the operator via the following command from the project root folder:
```bash
-docker build . -t flink-operator
+docker build . -t flink-kubernetes-operator
```
When using minikube you need to make this image available within the running minikube container:
```bash
-minikube image load flink-operator
+minikube image load flink-kubernetes-operator
```
## Deploying the operator
@@ -87,17 +87,17 @@ kubectl create -f https://github.com/jetstack/cert-manager/releases/download/v1.
```
You can deploy the operator via the included helm chart:
```bash
-helm install flink-operator helm/flink-operator
+helm install flink-kubernetes-operator helm/flink-kubernetes-operator
```
You may verify your installation via `kubectl` and `helm`:
```bash
kubectl get pods
NAME READY STATUS RESTARTS AGE
-flink-operator-fb5d46f94-ghd8b 2/2 Running 0 4m21s
+flink-kubernetes-operator-fb5d46f94-ghd8b 2/2 Running 0 4m21s
helm list
NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION
-flink-operator default 1 2022-03-09 17 (tel:12022030917):39:55.461359 +0100 CET deployed flink-operator-0.1.0 1.0.13
+flink-kubernetes-operator default 1 2022-03-09 17 (tel:12022030917):39:55.461359 +0100 CET deployed flink-kubernetes-operator-0.1.0 0.1.0
```
## Submitting a Flink job
diff --git a/flink-kubernetes-operator/pom.xml b/flink-kubernetes-operator/pom.xml
index 411d283..bf9479c 100644
--- a/flink-kubernetes-operator/pom.xml
+++ b/flink-kubernetes-operator/pom.xml
@@ -144,7 +144,7 @@ under the License.
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${project.basedir}/../helm/flink-operator/crds</outputDirectory>
+ <outputDirectory>${project.basedir}/../helm/flink-kubernetes-operator/crds</outputDirectory>
<resources>
<resource>
<directory>${project.build.outputDirectory}/META-INF/fabric8</directory>
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/OperatorMetricUtils.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/OperatorMetricUtils.java
index 4bb7d54..a63db24 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/OperatorMetricUtils.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/OperatorMetricUtils.java
@@ -39,7 +39,8 @@ public class OperatorMetricUtils {
metricRegistry,
operatorConfig,
EnvUtils.getOrDefault(EnvUtils.ENV_OPERATOR_NAMESPACE, "default"),
- EnvUtils.getOrDefault(EnvUtils.ENV_OPERATOR_NAME, "flink-operator"),
+ EnvUtils.getOrDefault(
+ EnvUtils.ENV_OPERATOR_NAME, "flink-kubernetes-operator"),
EnvUtils.getOrDefault(EnvUtils.ENV_HOSTNAME, "localhost"));
MetricGroup statusGroup = operatorMetricGroup.addGroup("Status");
MetricUtils.instantiateStatusMetrics(statusGroup);
diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
index 4289adc..2e1bfc3 100644
--- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
+++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
@@ -38,12 +38,16 @@ public class KubernetesOperatorMetricGroupTest {
MetricRegistryImpl registry = new MetricRegistryImpl(fromConfiguration(configuration));
KubernetesOperatorMetricGroup group =
KubernetesOperatorMetricGroup.create(
- registry, configuration, "default", "flink-operator", "localhost");
+ registry,
+ configuration,
+ "default",
+ "flink-kubernetes-operator",
+ "localhost");
assertArrayEquals(
- new String[] {"localhost", "k8soperator", "default", "flink-operator"},
+ new String[] {"localhost", "k8soperator", "default", "flink-kubernetes-operator"},
group.getScopeComponents());
assertEquals(
- "localhost.k8soperator.default.flink-operator.test",
+ "localhost.k8soperator.default.flink-kubernetes-operator.test",
group.getMetricIdentifier("test"));
assertEquals(
@@ -53,7 +57,7 @@ public class KubernetesOperatorMetricGroupTest {
"<namespace>",
"default",
"<name>",
- "flink-operator"),
+ "flink-kubernetes-operator"),
group.getAllVariables());
registry.shutdown().get();
@@ -67,12 +71,17 @@ public class KubernetesOperatorMetricGroupTest {
KubernetesOperatorMetricGroup group =
KubernetesOperatorMetricGroup.create(
- registry, configuration, "default", "flink-operator", "localhost");
+ registry,
+ configuration,
+ "default",
+ "flink-kubernetes-operator",
+ "localhost");
assertArrayEquals(
- new String[] {"foo", "localhost", "flink-operator", "default"},
+ new String[] {"foo", "localhost", "flink-kubernetes-operator", "default"},
group.getScopeComponents());
assertEquals(
- "foo.localhost.flink-operator.default.test", group.getMetricIdentifier("test"));
+ "foo.localhost.flink-kubernetes-operator.default.test",
+ group.getMetricIdentifier("test"));
assertEquals(
ImmutableMap.of(
@@ -81,7 +90,7 @@ public class KubernetesOperatorMetricGroupTest {
"<namespace>",
"default",
"<name>",
- "flink-operator"),
+ "flink-kubernetes-operator"),
group.getAllVariables());
registry.shutdown().get();
diff --git a/helm/flink-operator/.helmignore b/helm/flink-kubernetes-operator/.helmignore
similarity index 100%
rename from helm/flink-operator/.helmignore
rename to helm/flink-kubernetes-operator/.helmignore
diff --git a/helm/flink-operator/Chart.yaml b/helm/flink-kubernetes-operator/Chart.yaml
similarity index 91%
rename from helm/flink-operator/Chart.yaml
rename to helm/flink-kubernetes-operator/Chart.yaml
index 4e1d8f5..1982147 100644
--- a/helm/flink-operator/Chart.yaml
+++ b/helm/flink-kubernetes-operator/Chart.yaml
@@ -18,8 +18,8 @@
---
apiVersion: v2
-name: flink-operator
-description: A Helm chart for flink-operator
+name: flink-kubernetes-operator
+description: A Helm chart for the Apache Flink Kubernetes Operator
type: application
version: 0.1-SNAPSHOT
appVersion: 0.1-SNAPSHOT
diff --git a/helm/flink-operator/conf/flink-default-config/flink-conf.yaml b/helm/flink-kubernetes-operator/conf/flink-default-config/flink-conf.yaml
similarity index 100%
rename from helm/flink-operator/conf/flink-default-config/flink-conf.yaml
rename to helm/flink-kubernetes-operator/conf/flink-default-config/flink-conf.yaml
diff --git a/helm/flink-operator/conf/flink-default-config/log4j-console.properties b/helm/flink-kubernetes-operator/conf/flink-default-config/log4j-console.properties
similarity index 100%
rename from helm/flink-operator/conf/flink-default-config/log4j-console.properties
rename to helm/flink-kubernetes-operator/conf/flink-default-config/log4j-console.properties
diff --git a/helm/flink-operator/conf/flink-operator-config/flink-conf.yaml b/helm/flink-kubernetes-operator/conf/flink-operator-config/flink-conf.yaml
similarity index 100%
rename from helm/flink-operator/conf/flink-operator-config/flink-conf.yaml
rename to helm/flink-kubernetes-operator/conf/flink-operator-config/flink-conf.yaml
diff --git a/helm/flink-operator/conf/flink-operator-config/log4j2.properties b/helm/flink-kubernetes-operator/conf/flink-operator-config/log4j2.properties
similarity index 100%
rename from helm/flink-operator/conf/flink-operator-config/log4j2.properties
rename to helm/flink-kubernetes-operator/conf/flink-operator-config/log4j2.properties
diff --git a/helm/flink-operator/crds/flinkdeployments.flink.apache.org-v1.yml b/helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml
similarity index 100%
rename from helm/flink-operator/crds/flinkdeployments.flink.apache.org-v1.yml
rename to helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml
diff --git a/helm/flink-operator/templates/_helpers.tpl b/helm/flink-kubernetes-operator/templates/_helpers.tpl
similarity index 100%
rename from helm/flink-operator/templates/_helpers.tpl
rename to helm/flink-kubernetes-operator/templates/_helpers.tpl
diff --git a/helm/flink-operator/templates/flink-operator.yaml b/helm/flink-kubernetes-operator/templates/flink-operator.yaml
similarity index 100%
rename from helm/flink-operator/templates/flink-operator.yaml
rename to helm/flink-kubernetes-operator/templates/flink-operator.yaml
diff --git a/helm/flink-operator/templates/rbac.yaml b/helm/flink-kubernetes-operator/templates/rbac.yaml
similarity index 100%
rename from helm/flink-operator/templates/rbac.yaml
rename to helm/flink-kubernetes-operator/templates/rbac.yaml
diff --git a/helm/flink-operator/templates/serviceaccount.yaml b/helm/flink-kubernetes-operator/templates/serviceaccount.yaml
similarity index 100%
rename from helm/flink-operator/templates/serviceaccount.yaml
rename to helm/flink-kubernetes-operator/templates/serviceaccount.yaml
diff --git a/helm/flink-operator/templates/webhook.yaml b/helm/flink-kubernetes-operator/templates/webhook.yaml
similarity index 100%
rename from helm/flink-operator/templates/webhook.yaml
rename to helm/flink-kubernetes-operator/templates/webhook.yaml
diff --git a/helm/flink-operator/values.yaml b/helm/flink-kubernetes-operator/values.yaml
similarity index 98%
rename from helm/flink-operator/values.yaml
rename to helm/flink-kubernetes-operator/values.yaml
index 320dba5..b634f83 100644
--- a/helm/flink-operator/values.yaml
+++ b/helm/flink-kubernetes-operator/values.yaml
@@ -23,7 +23,7 @@
# watchNamespaces: ["flink"]
image:
- repository: flink-operator
+ repository: flink-kubernetes-operator
pullPolicy: IfNotPresent
tag: latest
diff --git a/pom.xml b/pom.xml
index 1368342..8b0972e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,7 +272,7 @@ under the License.
<!-- PyCharm -->
<exclude>**/.idea/**</exclude>
<!-- Generated CRD -->
- <exclude>helm/flink-operator/crds/flinkdeployments.flink.apache.org-v1.yml</exclude>
+ <exclude>helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml</exclude>
<exclude>rio.yml</exclude>
<!-- the licenses that are re-bundled -->
<exclude>**/packaged_licenses/LICENSE.*.txt</exclude>
diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh
index 9e3202b..7d306c1 100755
--- a/tools/releasing/create_source_release.sh
+++ b/tools/releasing/create_source_release.sh
@@ -94,16 +94,16 @@ apache_header=${CLONE_DIR}/flink-kubernetes-operator-${RELEASE_VERSION}/tools/re
commit_hash=$(git log -1 --pretty=format:%h)
# Attach apache header to generated crd
-cd flink-kubernetes-operator-${RELEASE_VERSION}/helm/flink-operator/crds
+cd flink-kubernetes-operator-${RELEASE_VERSION}/helm/flink-kubernetes-operator/crds
for FILE in *.yml; do attach_header $FILE $apache_header; done
cd ${CLONE_DIR}
# TODO: We might want to be more specific here later on what to replace
-perl -pi -e "s#^ repository: .*# repository: ghcr.io/apache/flink-operator#" flink-kubernetes-operator-${RELEASE_VERSION}/helm/flink-operator/values.yaml
-perl -pi -e "s#^ tag: .*# tag: ${commit_hash}#" flink-kubernetes-operator-${RELEASE_VERSION}/helm/flink-operator/values.yaml
+perl -pi -e "s#^ repository: .*# repository: ghcr.io/apache/flink-kubernetes-operator#" flink-kubernetes-operator-${RELEASE_VERSION}/helm/flink-kubernetes-operator/values.yaml
+perl -pi -e "s#^ tag: .*# tag: ${commit_hash}#" flink-kubernetes-operator-${RELEASE_VERSION}/helm/flink-kubernetes-operator/values.yaml
-helm package --app-version ${RELEASE_VERSION} --version ${RELEASE_VERSION} --destination ${RELEASE_DIR} flink-kubernetes-operator-${RELEASE_VERSION}/helm/flink-operator
-mv ${RELEASE_DIR}/flink-operator-${RELEASE_VERSION}.tgz ${RELEASE_DIR}/flink-kubernetes-operator-${RELEASE_VERSION}-helm.tgz
+helm package --app-version ${RELEASE_VERSION} --version ${RELEASE_VERSION} --destination ${RELEASE_DIR} flink-kubernetes-operator-${RELEASE_VERSION}/helm/flink-kubernetes-operator
+mv ${RELEASE_DIR}/flink-kubernetes-operator-${RELEASE_VERSION}.tgz ${RELEASE_DIR}/flink-kubernetes-operator-${RELEASE_VERSION}-helm.tgz
helm repo index ${RELEASE_DIR}
attach_header ${RELEASE_DIR}/index.yaml $apache_header
diff --git a/tools/releasing/update_branch_version.sh b/tools/releasing/update_branch_version.sh
index 8cf4bc1..3ad1d3f 100755
--- a/tools/releasing/update_branch_version.sh
+++ b/tools/releasing/update_branch_version.sh
@@ -62,8 +62,8 @@ mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${NEW_VERSION}
# change version in Dockerbuild file
perl -pi -e "s#^ENV OPERATOR_VERSION=.*#ENV OPERATOR_VERSION=${NEW_VERSION}#" Dockerfile
# change Helm chart version info
-perl -pi -e "s#^version: .*#version: ${NEW_VERSION}#" helm/flink-operator/Chart.yaml
-perl -pi -e "s#^appVersion: .*#appVersion: ${NEW_VERSION}#" helm/flink-operator/Chart.yaml
+perl -pi -e "s#^version: .*#version: ${NEW_VERSION}#" helm/flink-kubernetes-operator/Chart.yaml
+perl -pi -e "s#^appVersion: .*#appVersion: ${NEW_VERSION}#" helm/flink-kubernetes-operator/Chart.yaml
git commit -am "[release] Update version to ${NEW_VERSION}"