You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gy...@apache.org on 2022/12/27 15:44:32 UTC
[flink-kubernetes-operator] branch main updated: [FLINK-30456] Fixing Version and provider in OLM Description
This is an automated email from the ASF dual-hosted git repository.
gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 0009746c [FLINK-30456] Fixing Version and provider in OLM Description
0009746c is described below
commit 0009746cb3bf96bec0450e99e03c1af20f4038e9
Author: James Busche <10...@users.noreply.github.com>
AuthorDate: Tue Dec 27 07:44:26 2022 -0800
[FLINK-30456] Fixing Version and provider in OLM Description
---
...k-kubernetes-operator.clusterserviceversion.yaml | 21 ++++++++++++++++-----
tools/olm/docker-entry.sh | 9 +++------
tools/olm/generate-olm-bundle.sh | 2 +-
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/tools/olm/csv-template/bases/flink-kubernetes-operator.clusterserviceversion.yaml b/tools/olm/csv-template/bases/flink-kubernetes-operator.clusterserviceversion.yaml
index 41bbc265..bebfabea 100644
--- a/tools/olm/csv-template/bases/flink-kubernetes-operator.clusterserviceversion.yaml
+++ b/tools/olm/csv-template/bases/flink-kubernetes-operator.clusterserviceversion.yaml
@@ -130,7 +130,7 @@ spec:
metadata:
labels:
app.kubernetes.io/name: flink-kubernetes-operator
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: RELEASE_VERSION
name: flink
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -138,7 +138,7 @@ spec:
metadata:
labels:
app.kubernetes.io/name: flink-kubernetes-operator
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: RELEASE_VERSION
name: flink
rules:
- apiGroups:
@@ -161,7 +161,7 @@ spec:
metadata:
labels:
app.kubernetes.io/name: flink-kubernetes-operator
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: RELEASE_VERSION
name: flink-role-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -176,7 +176,7 @@ spec:
3. Proceed deploying Flink applications using the the Custom Resource Definition below.
```sh
- kubectl create -f https://raw.githubusercontent.com/apache/flink-kubernetes-operator/release-1.1/examples/basic.yaml
+ kubectl create -f https://raw.githubusercontent.com/apache/flink-kubernetes-operator/release-RELEASE_VERSION/examples/basic.yaml
```
See [Flink custom resources](https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-main/docs/custom-resource/overview/#overview) for more detail.
@@ -207,8 +207,19 @@ spec:
- email: jbusche@us.ibm.com
name: James Busche
maturity: beta
+ links:
+ - name: Website
+ url: https://flink.apache.org/
+ - name: Documentation
+ url: https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-main/
+ - name: Mailing list
+ url: https://lists.apache.org/list.html?dev@flink.apache.org
+ - name: Slack
+ url: https://apache-flink.slack.com/join/shared_invite/zt-1llkzbgyt-K2nNGGg88rfsDGLkT09Qzg#/shared-invite/email
+ - name: GitHub
+ url: https://github.com/apache/flink-kubernetes-operator
provider:
- name: " "
+ name: Community
url: https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-main/docs/try-flink-kubernetes-operator/quick-start/
replaces:
version: 1.1.0
diff --git a/tools/olm/docker-entry.sh b/tools/olm/docker-entry.sh
index 6005b670..9487d6c6 100755
--- a/tools/olm/docker-entry.sh
+++ b/tools/olm/docker-entry.sh
@@ -78,12 +78,6 @@ generate_olm_bundle() {
yq ea -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].resources = {"requests": {"cpu": "10m", "memory": "100Mi"}}' "${CSV_FILE}"
yq ea -i '.spec.install.spec.deployments[0].spec.template.spec.containers[1].resources = {"requests": {"cpu": "10m", "memory": "100Mi"}}' "${CSV_FILE}"
- # Only needed until this PR gets merged: https://github.com/apache/flink-kubernetes-operator/pull/420
- # yq ea -i '.spec.webhookdefinitions[0].rules[0].apiGroups=["flink.apache.org"]' "${CSV_FILE}"
- # yq ea -i '.spec.webhookdefinitions[1].rules[0].apiGroups=["flink.apache.org"]' "${CSV_FILE}"
- # yq ea -i '.spec.webhookdefinitions[0].generateName="validationwebhook.flink.apache.org"' "${CSV_FILE}"
- # yq ea -i '.spec.webhookdefinitions[1].generateName="mutationwebhook.flink.apache.org"' "${CSV_FILE}"
-
# The OLM lets operator to watch specified namespace with i.e.: spec.targetNamespaces:[bar, foo] in the OperatorGroup crd.
# The OLM then automatically injects template.metadata.annotations.olm.targetNamespaces:[bar, foo] into deployment.apps/flink-kubernetes-operator
# See PR https://github.com/apache/flink-kubernetes-operator/pull/420 see how the watchedNamespaces is assigned to targetNamespaces.
@@ -102,6 +96,9 @@ generate_olm_bundle() {
yq ea -i ".spec.replaces = \"${PACKAGE_NAME}.v${PREVIOUS_BUNDLE_VERSION}\" | .spec.replaces style=\"\"" "${CSV_FILE}"
yq ea -i "del(.subjects[0].namespace)" "${ROLE_BINDING}"
+
+ # Needed to replace description with new bundle values
+ sed -i "s/RELEASE_VERSION/${BUNDLE_VERSION}/" "${CSV_FILE}"
}
validate_olm_bundle() {
diff --git a/tools/olm/generate-olm-bundle.sh b/tools/olm/generate-olm-bundle.sh
index 31fbe191..e6328041 100755
--- a/tools/olm/generate-olm-bundle.sh
+++ b/tools/olm/generate-olm-bundle.sh
@@ -139,7 +139,7 @@ echo
echo "After the operator is ready, deploy a flink job using:
kubectl create -f ../../examples/basic.yaml
or
-kubectl create -f https://raw.githubusercontent.com/apache/flink-kubernetes-operator/release-1.2/examples/basic.yaml
+kubectl create -f https://raw.githubusercontent.com/apache/flink-kubernetes-operator/release-$BUNDLE_VERSION/examples/basic.yaml
"