Skip to content

Commit

Permalink
[Addon kubevela#579] Refactor kyuubi addon
Browse files Browse the repository at this point in the history
Signed-off-by: yanghua <[email protected]>
  • Loading branch information
yanghua committed Mar 10, 2023
1 parent b32de1b commit b09f608
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 125 deletions.
15 changes: 11 additions & 4 deletions experimental/addons/kyuubi/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
description: An addon for KubeVela.
icon: ""
description: A distributed and multi-tenant gateway to provide serverless SQL on lakehouses.
icon: "https://raw.githubusercontent.com/apache/kyuubi/master/docs/imgs/logo.png"
invisible: false
name: kyuubi
tags:
- my-tag
version: 1.0.0
- apache/kyuubi
version: 1.6
url: https://github.com/apache/kyuubi

dependencies:
- name: fluxcd

system:
vela: ">=1.5.0-beta.3"
10 changes: 8 additions & 2 deletions experimental/addons/kyuubi/parameter.cue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
// For example, you can use parameters to allow the user to customize
// container images, ports, and etc.
parameter: {
// +usage=Custom parameter description
myparam: *"myns" | string
// +usage=Deploy to specified clusters. Leave empty to deploy to all clusters.
clusters?: [...string]
// +usage=Namespace to deploy to
namespace: *"kyuubi-ns" | string
// +usage=Specify the image repository
"imageRepository": *"apache/kyuubi" | string
// +usage=Specify the image tag
"imageTag": *"" | string
}
18 changes: 0 additions & 18 deletions experimental/addons/kyuubi/resources/myresource.cue

This file was deleted.

8 changes: 0 additions & 8 deletions experimental/addons/kyuubi/schemas/myschema.yaml

This file was deleted.

88 changes: 26 additions & 62 deletions experimental/addons/kyuubi/template.cue
Original file line number Diff line number Diff line change
Expand Up @@ -3,69 +3,33 @@ output: {
apiVersion: "core.oam.dev/v1beta1"
kind: "Application"
spec: {
components: [
{
type: "k8s-objects"
name: "kyuubi-ns"
properties: objects: [{
apiVersion: "v1"
kind: "Namespace"
metadata: name: parameter.namespace
}]
},
{
name: "flink-operator-helm"
type: "helm"
dependsOn: ["kyuubi-ns"]
type: "helm"
properties: {
repoType: "helm"
url: "https://github.com/apache/kyuubi/tree/master/charts/kyuubi"
chart: "kyuubi"
targetNamespace: parameter["namespace"]
version: "1.6.0"
values: {
webhook: {
create: parameter["createWebhook"]
}

image: {
repository: parameter["imageRepository"]
tag: parameter["imageTag"]
}

jobServiceAccount: {
create: parameter["createJobServiceAccount"]
}

operatorServiceAccount: {
name: "flink-kubernetes-operator"
}
}
}
}
]
policies: [
{
type: "shared-resource"
name: "namespace"
properties: rules: [{
selector: resourceTypes: ["Namespace"]
}]
},
{
type: "topology"
name: "deploy-cert-manager-ns"
properties: {
namespace: parameter.namespace
if parameter.clusters != _|_ {
clusters: parameter.clusters
components: [{
type: "k8s-objects"
name: "kyuubi-ns"
properties: objects: [{
apiVersion: "v1"
kind: "Namespace"
metadata: name: parameter.namespace
}]
},
{
name: "kyuubi-helm"
type: "helm"
dependsOn: ["kyuubi-ns"]
properties: {
repoType: "helm"
url: "https://awesome-kyuubi.github.io/kyuubi-helm-chart/"
chart: "kyuubi"
targetNamespace: parameter["namespace"]
version: "0.1.0"
values: {
image: {
repository: parameter["imageRepository"]
tag: parameter["imageTag"]
},
}
if parameter.clusters == _|_ {
clusterLabelSelector: {}
}
}
}
]
}]
policies: []
}
}
31 changes: 0 additions & 31 deletions experimental/addons/kyuubi/views/my-view.cue

This file was deleted.

0 comments on commit b09f608

Please sign in to comment.