Merge pull request #1 from fantapsody/fix-func-mesh

Fix olm subscriptions

modules/olm-subscriptions/chart/templates/flink.yaml

@@ -0,0 +1,32 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+{{- if and .Values.components.flink }}
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: {{ .Values.flink.name }}
+  namespace: {{ .Values.install_namespace }}
+spec:
+  channel: {{ .Values.flink.channel }}
+  installPlanApproval: {{ .Values.flink.approval }}  
+  source: {{ .Values.flink.source }}
+  sourceNamespace: {{ .Values.catalog_namespace }}
+  name: {{ .Values.flink.name }}
+{{- end }}

modules/olm-subscriptions/chart/templates/flinksql.yaml

@@ -0,0 +1,32 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+{{- if and .Values.components.flinkSql }}
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: {{ .Values.flinkSql.name }}
+  namespace: {{ .Values.install_namespace }}
+spec:
+  channel: {{ .Values.flinkSql.channel }}
+  installPlanApproval: {{ .Values.flinkSql.approval }}  
+  source: {{ .Values.flinkSql.source }}
+  sourceNamespace: {{ .Values.catalog_namespace }}
+  name: {{ .Values.flinkSql.name }}
+{{- end }}

modules/olm-subscriptions/chart/templates/functionmesh.yaml

@@ -28,9 +28,9 @@ spec:
   config:
     env:
     - name: ENABLE_WEBHOOKS
-      value: {{ .Values.functionMesh.config.enableWebhooks }}
+      value: "{{ .Values.functionMesh.config.enableWebhooks }}"
     - name: ENABLE_FUNCTION_MESH_CONTROLLER
-      value: {{ .Values.functionMesh.config.enableController }}
+      value: "{{ .Values.functionMesh.config.enableController }}"
   installPlanApproval: {{ .Values.functionMesh.approval }}  
   source: {{ .Values.functionMesh.source }}
   sourceNamespace: {{ .Values.catalog_namespace }}

modules/olm-subscriptions/chart/values.yaml

@@ -25,9 +25,11 @@ sn_image: ""
 
 components:
   bookkeeper: true
-  function-mesh: true
+  functionMesh: true
   prometheus: true
   pulsar: true
+  flink: true
+  flinkSql: true
   zookeeper: true
 
 bookkeeper:
@@ -36,6 +38,18 @@ bookkeeper:
   source: sn-catalog
   name: bookkeeper-operator
 
+flink:
+  approval: Automatic
+  channel: stable
+  source: sn-catalog
+  name: flink-on-k8s-operator
+
+flinkSql:
+  approval: Automatic
+  channel: stable
+  source: sn-catalog
+  name: sql-operator
+
 functionMesh:
   approval: Automatic
   channel: alpha