Feat: bump vela to v1.5.2 (#78)

kubevela · Aug 14, 2022 · f9b3b71 · f9b3b71
1 parent 11757c0
commit f9b3b71
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 123 deletions.
diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
@@ -59,7 +59,7 @@ jobs:
         with:
           name: velad-darwin-amd64
       - name: Setup Docker
-        uses: docker-practice/[email protected].8
+        uses: docker-practice/[email protected].11
       - run: chmod u+x velad-darwin-amd64 && mv velad-darwin-amd64 velad
       - run: ./velad install
       - run: vela def list

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ include makefiles/dependency.mk
 
 K3S_VERSION ?= v1.21.10+k3s1
 STATIC_DIR := pkg/resources/static
-VELA_VERSION ?= v1.5.0
+VELA_VERSION ?= v1.5.2
 VELAUX_VERSION ?= v1.5.0
 LDFLAGS= "-X github.com/oam-dev/velad/version.VelaUXVersion=${VELAUX_VERSION} -X github.com/oam-dev/velad/version.VelaVersion=${VELA_VERSION}"
 OS ?= linux

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/fatih/color v1.13.0
 	github.com/k3d-io/k3d/v5 v5.4.1
 	github.com/kyokomi/emoji/v2 v2.2.9
-	github.com/oam-dev/kubevela v1.5.0
+	github.com/oam-dev/kubevela v1.5.2
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.4.0
 	github.com/stretchr/testify v1.7.1

diff --git a/go.sum b/go.sum
@@ -1486,8 +1486,8 @@ github.com/oam-dev/cluster-gateway v1.4.0 h1:ZZcNRYsUDRWM5JnNX28/zdSPRKERGstcAY+
 github.com/oam-dev/cluster-gateway v1.4.0/go.mod h1:qnCczkXtTY7h0SqxjZqAAyKQPwrJjLIFy+IdeoaYKCU=
 github.com/oam-dev/cluster-register v1.0.4-0.20220325092210-cee4a3d3fb7d h1:ZZsBkksYDzwJEjqx9/XBD+VwlhHz8flkZvMJYzO4ASA=
 github.com/oam-dev/cluster-register v1.0.4-0.20220325092210-cee4a3d3fb7d/go.mod h1:nKEUMfuEB8pHKsaSah9IA+UQzezrPYebBdRozyNtlZc=
-github.com/oam-dev/kubevela v1.5.0 h1:zwW1Ya9Nw4sKWhkeR/hdmRIKcYrRNEy+7DbaDKb9PKU=
-github.com/oam-dev/kubevela v1.5.0/go.mod h1:bJB9TyKcPAeAXMK8XHoSiS5aFNp7O/OIXEfJGHxd23s=
+github.com/oam-dev/kubevela v1.5.2 h1:6Jfgg05E7ZskB1KtagNi8piJm7duzcXMSNuS5QTeniM=
+github.com/oam-dev/kubevela v1.5.2/go.mod h1:bJB9TyKcPAeAXMK8XHoSiS5aFNp7O/OIXEfJGHxd23s=
 github.com/oam-dev/stern v1.13.2 h1:jlGgtJbKmIVhzkH44ft5plkgs8XEfvxbFrQdX60CQR4=
 github.com/oam-dev/stern v1.13.2/go.mod h1:0pLjZt0amXE/ErF16Rdrgd98H2owN8Hmn3/7CX5+AeA=
 github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 h1:tD8HiFKnt0jnwdTWjeqUnfnUYLD/+Nsmj8ZGIxqDWiU=

diff --git a/pkg/resources/static/vela/charts/vela-core/Chart.yaml b/pkg/resources/static/vela/charts/vela-core/Chart.yaml
@@ -14,11 +14,11 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: v1.5.0
+version: v1.5.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: v1.5.0
+appVersion: v1.5.2
 
 home: https://kubevela.io
 icon: https://kubevela.io/img/logo.svg
diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/annotations.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/annotations.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add annotations on your workload. if it generates pod, add same annotations for generated pods.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: annotations
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/command.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/command.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add command on K8s pod for your workload which follows the pod spec in path 'spec.template'
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: command
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/container-image.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/container-image.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Set the image of the container.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: container-image
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/cpuscaler.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/cpuscaler.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Automatically scale the component based on CPU usage.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: cpuscaler
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/env.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/env.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add env on K8s pod for your workload which follows the pod spec in path 'spec.template'
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: env
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/expose.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/expose.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Expose port to enable web traffic for your component.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: expose
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/hostalias.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/hostalias.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add host aliases on K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: hostalias
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/...rces/static/vela/charts/vela-core/templates/defwithtemplate/import-grafana-dashboard.yaml b/...rces/static/vela/charts/vela-core/templates/defwithtemplate/import-grafana-dashboard.yaml
diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/init-container.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/init-container.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: add an init container and use shared volume with pod
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: init-container
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/labels.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/labels.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add labels on your workload. if it generates pod, add same label for generated pods.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: labels
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/lifecycle.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/lifecycle.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add lifecycle hooks for every container of K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: lifecycle
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/...s/static/vela/charts/vela-core/templates/defwithtemplate/register-grafana-datasource.yaml b/...s/static/vela/charts/vela-core/templates/defwithtemplate/register-grafana-datasource.yaml
diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/resource.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/resource.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add resource requests and limits on K8s pod for your workload which follows the pod spec in path 'spec.template.'
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/shared-resource.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/shared-resource.yaml
@@ -0,0 +1,38 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/shared-resource.cue
+apiVersion: core.oam.dev/v1beta1
+kind: PolicyDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Configure the resources to be sharable across applications.
+  name: shared-resource
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        #SharedResourcePolicyRule: {
+        	// +usage=Specify how to select the targets of the rule
+        	selector: [...#ResourcePolicyRuleSelector]
+        }
+        #ResourcePolicyRuleSelector: {
+        	// +usage=Select resources by component names
+        	componentNames?: [...string]
+        	// +usage=Select resources by component types
+        	componentTypes?: [...string]
+        	// +usage=Select resources by oamTypes (COMPONENT or TRAIT)
+        	oamTypes?: [...string]
+        	// +usage=Select resources by trait types
+        	traitTypes?: [...string]
+        	// +usage=Select resources by resource types (like Deployment)
+        	resourceTypes?: [...string]
+        	// +usage=Select resources by their names
+        	resourceNames?: [...string]
+        }
+        parameter: {
+        	// +usage=Specify the list of rules to control shared-resource strategy at resource level.
+        	// The selected resource will be sharable across applications. (That means multiple applications
+        	// can all read it without conflict, but only the first one can write it)
+        	rules?: [...#SharedResourcePolicyRule]
+        }
+
diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/sidecar.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/sidecar.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Inject a sidecar container to K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: sidecar
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec: