From 5455b8d952f0b751e7029bbc61853ba9e3da42a9 Mon Sep 17 00:00:00 2001 From: Dylan McGannon Date: Tue, 21 Jan 2020 19:27:36 +1100 Subject: [PATCH] [incubator/kubeless] Update kubeless version and fix resource issues (#20225) * [incubator/kubeless] Update kubeless version and fix resource issues Updates the version of the kubeless function controller as well as fixing invalid resource definitions due to kube api changes. Signed-off-by: Dylan McGannon * [incubator/kubeless] Update CRDs for helm3 compatibility Signed-off-by: Dylan McGannon * [incubator/kubeless] update trigger controller images. Signed-off-by: Dylan McGannon --- incubator/kubeless/Chart.yaml | 4 ++-- .../{templates => crds}/cronjobtrigger-crd.yaml | 6 ++++-- .../kubeless/{templates => crds}/function-crd.yaml | 8 ++++---- .../kubeless/{templates => crds}/httptrigger-crd.yaml | 6 ++++-- .../{templates => crds}/kafka-trigger-type-crd.yaml | 10 ++++++---- .../kubeless/templates/controller-deployment.yaml | 11 ++++++++++- incubator/kubeless/templates/crds.yaml | 4 ++++ incubator/kubeless/values.yaml | 10 +++++----- 8 files changed, 39 insertions(+), 20 deletions(-) rename incubator/kubeless/{templates => crds}/cronjobtrigger-crd.yaml (71%) rename incubator/kubeless/{templates => crds}/function-crd.yaml (64%) rename incubator/kubeless/{templates => crds}/httptrigger-crd.yaml (70%) rename incubator/kubeless/{templates => crds}/kafka-trigger-type-crd.yaml (63%) create mode 100644 incubator/kubeless/templates/crds.yaml diff --git a/incubator/kubeless/Chart.yaml b/incubator/kubeless/Chart.yaml index 2207fdccc8..1be01d369b 100644 --- a/incubator/kubeless/Chart.yaml +++ b/incubator/kubeless/Chart.yaml @@ -1,6 +1,6 @@ name: kubeless -version: 2.1.0 -appVersion: v1.0.4 +version: 2.1.1 +appVersion: v1.0.5 description: Kubeless is a Kubernetes-native serverless framework. It runs on top of your Kubernetes cluster and allows you to deploy small unit of code without having to build container images. icon: https://cloud.githubusercontent.com/assets/4056725/25480209/1d5bf83c-2b48-11e7-8db8-bcd650f31297.png apiVersion: v1 diff --git a/incubator/kubeless/templates/cronjobtrigger-crd.yaml b/incubator/kubeless/crds/cronjobtrigger-crd.yaml similarity index 71% rename from incubator/kubeless/templates/cronjobtrigger-crd.yaml rename to incubator/kubeless/crds/cronjobtrigger-crd.yaml index ca9822cabd..70864b72c3 100644 --- a/incubator/kubeless/templates/cronjobtrigger-crd.yaml +++ b/incubator/kubeless/crds/cronjobtrigger-crd.yaml @@ -1,10 +1,12 @@ apiVersion: apiextensions.k8s.io/v1beta1 -description: CRD object for Cron trigger type kind: CustomResourceDefinition metadata: name: cronjobtriggers.kubeless.io labels: -{{ include "labels.standard" . | indent 4 }} + app: kubeless + annotations: + helm.sh/hook: crd-install + helm.sh/hook-delete-policy: before-hook-creation spec: group: kubeless.io names: diff --git a/incubator/kubeless/templates/function-crd.yaml b/incubator/kubeless/crds/function-crd.yaml similarity index 64% rename from incubator/kubeless/templates/function-crd.yaml rename to incubator/kubeless/crds/function-crd.yaml index cd79045d68..8f56222202 100644 --- a/incubator/kubeless/templates/function-crd.yaml +++ b/incubator/kubeless/crds/function-crd.yaml @@ -1,12 +1,12 @@ apiVersion: apiextensions.k8s.io/v1beta1 -description: Kubernetes Native Serverless Framework kind: CustomResourceDefinition metadata: name: functions.kubeless.io - annotations: - kubeless.io/namespace: {{ .Release.Namespace }} labels: -{{ include "labels.standard" . | indent 4 }} + app: kubeless + annotations: + helm.sh/hook: crd-install + helm.sh/hook-delete-policy: before-hook-creation spec: group: kubeless.io names: diff --git a/incubator/kubeless/templates/httptrigger-crd.yaml b/incubator/kubeless/crds/httptrigger-crd.yaml similarity index 70% rename from incubator/kubeless/templates/httptrigger-crd.yaml rename to incubator/kubeless/crds/httptrigger-crd.yaml index 7f27a7c0a5..e5f03f226b 100644 --- a/incubator/kubeless/templates/httptrigger-crd.yaml +++ b/incubator/kubeless/crds/httptrigger-crd.yaml @@ -1,10 +1,12 @@ apiVersion: apiextensions.k8s.io/v1beta1 -description: CRD object for HTTP trigger type kind: CustomResourceDefinition metadata: name: httptriggers.kubeless.io labels: -{{ include "labels.standard" . | indent 4 }} + app: kubeless + annotations: + helm.sh/hook: crd-install + helm.sh/hook-delete-policy: before-hook-creation spec: group: kubeless.io names: diff --git a/incubator/kubeless/templates/kafka-trigger-type-crd.yaml b/incubator/kubeless/crds/kafka-trigger-type-crd.yaml similarity index 63% rename from incubator/kubeless/templates/kafka-trigger-type-crd.yaml rename to incubator/kubeless/crds/kafka-trigger-type-crd.yaml index 1bb147e339..a50717d51b 100644 --- a/incubator/kubeless/templates/kafka-trigger-type-crd.yaml +++ b/incubator/kubeless/crds/kafka-trigger-type-crd.yaml @@ -1,9 +1,12 @@ -{{- if .Values.kafkaTrigger.enabled }} apiVersion: apiextensions.k8s.io/v1beta1 -description: CRD object for Kafka trigger type kind: CustomResourceDefinition metadata: name: kafkatriggers.kubeless.io + labels: + app: kubeless + annotations: + helm.sh/hook: crd-install + helm.sh/hook-delete-policy: before-hook-creation spec: group: kubeless.io names: @@ -11,5 +14,4 @@ spec: plural: kafkatriggers singular: kafkatrigger scope: Namespaced - version: v1beta1 -{{- end }} \ No newline at end of file + version: v1beta1 \ No newline at end of file diff --git a/incubator/kubeless/templates/controller-deployment.yaml b/incubator/kubeless/templates/controller-deployment.yaml index f8b296e5bc..2f1b7517fb 100644 --- a/incubator/kubeless/templates/controller-deployment.yaml +++ b/incubator/kubeless/templates/controller-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "kubeless.fullname" . }}-controller-manager @@ -21,16 +21,25 @@ spec: - name: kubeless-function-controller image: "{{ .Values.controller.deployment.functionController.image.repository }}:{{ .Values.controller.deployment.functionController.image.tag }}" imagePullPolicy: {{ .Values.controller.deployment.functionController.image.pullPolicy }} + env: + - name: KUBELESS_NAMESPACE + value: {{ .Release.Namespace }} resources: {{ toYaml .Values.controller.resources | indent 10 }} - name: http-trigger-controller image: "{{ .Values.controller.deployment.httpTriggerController.image.repository }}:{{ .Values.controller.deployment.httpTriggerController.image.tag }}" imagePullPolicy: {{ .Values.controller.deployment.httpTriggerController.image.pullPolicy }} + env: + - name: KUBELESS_NAMESPACE + value: {{ .Release.Namespace }} resources: {{ toYaml .Values.controller.resources | indent 10 }} - name: cronjob-trigger-controller image: "{{ .Values.controller.deployment.cronJobTriggerController.image.repository }}:{{ .Values.controller.deployment.cronJobTriggerController.image.tag }}" imagePullPolicy: {{ .Values.controller.deployment.cronJobTriggerController.image.pullPolicy }} + env: + - name: KUBELESS_NAMESPACE + value: {{ .Release.Namespace }} resources: {{ toYaml .Values.controller.resources | indent 10 }} {{- if .Values.rbac.create }} diff --git a/incubator/kubeless/templates/crds.yaml b/incubator/kubeless/templates/crds.yaml new file mode 100644 index 0000000000..285bece6c0 --- /dev/null +++ b/incubator/kubeless/templates/crds.yaml @@ -0,0 +1,4 @@ +{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }} +{{ $.Files.Get $path }} +--- +{{- end }} diff --git a/incubator/kubeless/values.yaml b/incubator/kubeless/values.yaml index 13b09c67c8..62ded80da3 100644 --- a/incubator/kubeless/values.yaml +++ b/incubator/kubeless/values.yaml @@ -10,17 +10,17 @@ controller: functionController: image: repository: kubeless/function-controller - tag: v1.0.4 + tag: v1.0.5 pullPolicy: IfNotPresent httpTriggerController: image: - repository: bitnami/http-trigger-controller - tag: v1.0.0 + repository: kubeless/http-trigger-controller + tag: v1.0.1 pullPolicy: IfNotPresent cronJobTriggerController: image: - repository: bitnami/cronjob-trigger-controller - tag: v1.0.0 + repository: kubeless/cronjob-trigger-controller + tag: v1.0.1 pullPolicy: IfNotPresent ## Kubeless Controller resource requests and limits ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/