From 2d24ad10bafef989fe5a0f804dca6cb4bd4cd166 Mon Sep 17 00:00:00 2001 From: Sanket Sudake Date: Mon, 27 Nov 2023 14:22:39 +0530 Subject: [PATCH] Chart for v1.20.0-rc2 release (#77) * Chart for v1.20.0-rc2 release * Update keda connectors images --------- Signed-off-by: Sanket Sudake --- charts/fission-all/Chart.yaml | 4 +- .../templates/_fission-component-roles.tpl | 18 --- .../templates/_fission-kubernetes-roles.tpl | 48 -------- .../_fission-kuberntes-role-generator.tpl | 3 - .../templates/_fission-role-generator.tpl | 3 - .../mqt-fission-kafka/deployment.yaml | 108 ------------------ .../mqt-fission-kafka/podmonitor.yaml | 23 ---- .../mqt-fission-kafka/role-fission-cr.yaml | 7 -- .../mqt-fission-kafka/role-kubernetes.yaml | 7 -- .../mqt-fission-kafka/serviceaccount.yaml | 5 - charts/fission-all/values.yaml | 80 +++---------- 11 files changed, 21 insertions(+), 285 deletions(-) delete mode 100644 charts/fission-all/templates/mqt-fission-kafka/deployment.yaml delete mode 100644 charts/fission-all/templates/mqt-fission-kafka/podmonitor.yaml delete mode 100644 charts/fission-all/templates/mqt-fission-kafka/role-fission-cr.yaml delete mode 100644 charts/fission-all/templates/mqt-fission-kafka/role-kubernetes.yaml delete mode 100644 charts/fission-all/templates/mqt-fission-kafka/serviceaccount.yaml diff --git a/charts/fission-all/Chart.yaml b/charts/fission-all/Chart.yaml index 277ab72..26a5903 100644 --- a/charts/fission-all/Chart.yaml +++ b/charts/fission-all/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: fission-all -version: v1.20.0-rc1 -appVersion: v1.20.0-rc1 +version: v1.20.0-rc2 +appVersion: v1.20.0-rc2 description: Fission is a fast serverless framework for Kubernetes. home: https://fission.io/ icon: https://fission.io/images/fission-logo-white.svg diff --git a/charts/fission-all/templates/_fission-component-roles.tpl b/charts/fission-all/templates/_fission-component-roles.tpl index 0fe30b1..ccc4936 100644 --- a/charts/fission-all/templates/_fission-component-roles.tpl +++ b/charts/fission-all/templates/_fission-component-roles.tpl @@ -50,24 +50,6 @@ rules: - patch - delete {{- end }} -{{- define "kafka-rules" }} -rules: -- apiGroups: - - fission.io - resources: - - environments - - functions - - messagequeuetriggers - - packages - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -{{- end }} {{- define "keda-rules" }} rules: - apiGroups: diff --git a/charts/fission-all/templates/_fission-kubernetes-roles.tpl b/charts/fission-all/templates/_fission-kubernetes-roles.tpl index 5d9a0c8..5392ac1 100644 --- a/charts/fission-all/templates/_fission-kubernetes-roles.tpl +++ b/charts/fission-all/templates/_fission-kubernetes-roles.tpl @@ -195,54 +195,6 @@ rules: - list - watch {{- end }} -{{- define "kafka-kuberules" }} -rules: -- apiGroups: - - "" - resources: - - configmaps - - pods - - secrets - - services - - replicationcontrollers - - events - verbs: - - create - - delete - - get - - list - - watch - - patch -- apiGroups: - - "" - resources: - - configmaps - - secrets - verbs: - - get -- apiGroups: - - apps - resources: - - deployments - - deployments/scale - - replicasets - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - get - - list - - watch -{{- end }} {{- define "keda-kuberules" }} rules: - apiGroups: diff --git a/charts/fission-all/templates/_fission-kuberntes-role-generator.tpl b/charts/fission-all/templates/_fission-kuberntes-role-generator.tpl index 7be2a57..abf1556 100644 --- a/charts/fission-all/templates/_fission-kuberntes-role-generator.tpl +++ b/charts/fission-all/templates/_fission-kuberntes-role-generator.tpl @@ -26,9 +26,6 @@ metadata: {{- if eq "kubewatcher" .component }} {{- include "kubewatcher-kuberules" . }} {{- end }} -{{- if eq "kafka" .component }} -{{- include "kafka-kuberules" . }} -{{- end }} {{- if eq "keda" .component }} {{- include "keda-kuberules" . }} {{- end }} diff --git a/charts/fission-all/templates/_fission-role-generator.tpl b/charts/fission-all/templates/_fission-role-generator.tpl index d5a7d90..df54203 100644 --- a/charts/fission-all/templates/_fission-role-generator.tpl +++ b/charts/fission-all/templates/_fission-role-generator.tpl @@ -20,9 +20,6 @@ metadata: {{- if eq "kubewatcher" .component }} {{- include "kubewatcher-rules" . }} {{- end }} -{{- if eq "kafka" .component }} -{{- include "kafka-rules" . }} -{{- end }} {{- if eq "keda" .component }} {{- include "keda-rules" . }} {{- end }} diff --git a/charts/fission-all/templates/mqt-fission-kafka/deployment.yaml b/charts/fission-all/templates/mqt-fission-kafka/deployment.yaml deleted file mode 100644 index 1ccc2c1..0000000 --- a/charts/fission-all/templates/mqt-fission-kafka/deployment.yaml +++ /dev/null @@ -1,108 +0,0 @@ -{{- if .Values.kafka.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: mqtrigger-kafka - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - svc: mqtrigger - messagequeue: kafka -spec: - replicas: 1 - selector: - matchLabels: - svc: mqtrigger - messagequeue: kafka - template: - metadata: - labels: - svc: mqtrigger - messagequeue: kafka - annotations: - prometheus.io/scrape: "true" - prometheus.io/path: "/metrics" - prometheus.io/port: "8080" - spec: - containers: - - name: mqtrigger - image: {{ include "fission-bundleImage" . | quote }} - imagePullPolicy: {{ .Values.pullPolicy }} - command: ["/fission-bundle"] - args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"] - ports: - - containerPort: 8080 - name: metrics - env: - - name: MESSAGE_QUEUE_TYPE - value: kafka - - name: MESSAGE_QUEUE_URL - value: "{{.Values.kafka.brokers}}" - - name: MESSAGE_QUEUE_KAFKA_VERSION - value: "{{.Values.kafka.version}}" - - name: DEBUG_ENV - value: {{ .Values.debugEnv | quote }} - - name: PPROF_ENABLED - value: {{ .Values.pprof.enabled | quote }} - {{- include "fission-resource-namespace.envs" . | indent 8 }} - {{- include "opentelemtry.envs" . | indent 8 }} - # TLS authentication is TLS with authentication (2 way) - # More info: https://docs.confluent.io/current/kafka/authentication_ssl.html#ssl-overview - {{- if .Values.kafka.authentication.tls.enabled }} - - name: TLS_ENABLED - value: "true" - - name: MESSAGE_QUEUE_SECRETS - value: /etc/fission/secrets - - name: INSECURE_SKIP_VERIFY - value: "{{ .Values.kafka.authentication.tls.insecureSkipVerify }}" - volumeMounts: - - name: kafka-secrets - mountPath: /etc/fission/secrets - {{- end }} - {{- if .Values.terminationMessagePath }} - terminationMessagePath: {{ .Values.terminationMessagePath }} - {{- end }} - {{- if .Values.terminationMessagePolicy }} - terminationMessagePolicy: {{ .Values.terminationMessagePolicy }} - {{- end }} - serviceAccountName: fission-kafka - {{- if .Values.kafka.authentication.tls.enabled }} - volumes: - - name: kafka-secrets - secret: - secretName: mqtrigger-kafka-secrets - {{- end }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - - ---- -{{- if .Values.kafka.authentication.tls.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: mqtrigger-kafka-secrets - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" -data: - {{- if .Files.Get (printf "%s" .Values.kafka.authentication.tls.caCert) }} - caCert: {{ .Files.Get (printf "%s" .Values.kafka.authentication.tls.caCert) | b64enc }} - {{- else }} - {{ fail "Invalid chart. CA Certificate not found." }} - {{- end }} - {{- if .Files.Get (printf "%s" .Values.kafka.authentication.tls.userCert) }} - userCert: {{ .Files.Get (printf "%s" .Values.kafka.authentication.tls.userCert) | b64enc }} - {{- else }} - {{ fail "Invalid chart. User Certificate not found." }} - {{- end }} - {{- if .Files.Get (printf "%s" .Values.kafka.authentication.tls.userKey) }} - userKey: {{ .Files.Get (printf "%s" .Values.kafka.authentication.tls.userKey) | b64enc }} - {{- else }} - {{ fail "Invalid chart. User Key not found." }} - {{- end }} -{{- end }} -{{- if .Values.extraCoreComponentPodConfig }} -{{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/fission-all/templates/mqt-fission-kafka/podmonitor.yaml b/charts/fission-all/templates/mqt-fission-kafka/podmonitor.yaml deleted file mode 100644 index d15c3a5..0000000 --- a/charts/fission-all/templates/mqt-fission-kafka/podmonitor.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.podMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: mqt-fission-kafka-monitor - {{- if .Values.podMonitor.namespace }} - namespace: {{ .Values.podMonitor.namespace }} - {{- end }} - {{- with .Values.podMonitor.additionalPodMonitorLabels }} - labels: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - namespaceSelector: - matchNames: - - {{ .Release.Namespace }} - selector: - matchLabels: - svc: mqtrigger - podMetricsEndpoints: - - port: "metrics" - path: "/metrics" -{{- end -}} diff --git a/charts/fission-all/templates/mqt-fission-kafka/role-fission-cr.yaml b/charts/fission-all/templates/mqt-fission-kafka/role-fission-cr.yaml deleted file mode 100644 index 8844112..0000000 --- a/charts/fission-all/templates/mqt-fission-kafka/role-fission-cr.yaml +++ /dev/null @@ -1,7 +0,0 @@ -{{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "kafka") .) }} - -{{- if gt (len .Values.additionalFissionNamespaces) 0 }} -{{- range $namespace := $.Values.additionalFissionNamespaces }} -{{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "kafka") $) }} -{{- end }} -{{- end }} diff --git a/charts/fission-all/templates/mqt-fission-kafka/role-kubernetes.yaml b/charts/fission-all/templates/mqt-fission-kafka/role-kubernetes.yaml deleted file mode 100644 index f91facd..0000000 --- a/charts/fission-all/templates/mqt-fission-kafka/role-kubernetes.yaml +++ /dev/null @@ -1,7 +0,0 @@ -{{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "kafka") .) }} - -{{- if gt (len .Values.additionalFissionNamespaces) 0 }} -{{- range $namespace := $.Values.additionalFissionNamespaces }} -{{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "kafka") $) }} -{{- end }} -{{- end }} diff --git a/charts/fission-all/templates/mqt-fission-kafka/serviceaccount.yaml b/charts/fission-all/templates/mqt-fission-kafka/serviceaccount.yaml deleted file mode 100644 index c0d0f81..0000000 --- a/charts/fission-all/templates/mqt-fission-kafka/serviceaccount.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: fission-kafka - namespace: {{ .Release.Namespace }} diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml index fd6fde3..63ef639 100644 --- a/charts/fission-all/values.yaml +++ b/charts/fission-all/values.yaml @@ -25,7 +25,7 @@ image: fission/fission-bundle ## It is also used by the chart to identify version of the few more images apart from fission-bundle. ## Keep it empty for using latest tag. ## -imageTag: v1.20.0-rc1 +imageTag: v1.20.0-rc2 ## pullPolicy represents the pull policy to use for images in the chart. ## @@ -99,7 +99,7 @@ fetcher: ## image represents the image of the fetcher component. image: fission/fetcher ## imageTag represents the tag of the image of the fetcher component. - imageTag: v1.20.0-rc1 + imageTag: v1.20.0-rc2 ## Fetcher is only for to downloading or uploading archive. ## Normally, you don't need to change the value here, unless necessary. @@ -459,48 +459,6 @@ timer: runAsUser: 10001 runAsGroup: 10001 -## Kafka: enable and configure the details -## -kafka: - enabled: false - ## note: below link is only for reference. - ## Please use the brokers link for your kafka here. - ## - brokers: "broker.kafka:9092" # or your-bootstrap-server.kafka:9092/9093 - ## Sample config for authentication - ## authentication: - ## tls: - ## enabled: true - ## caCert: 'auth/kafka/ca.crt' - ## userCert: 'auth/kafka/user.crt' - ## userKey: 'auth/kafka/user.key' - ## - authentication: - tls: - enabled: false - ## InsecureSkipVerify controls whether a client verifies the server's certificate chain and host name. - ## Warning: Setting this to true, makes TLS susceptible to man-in-the-middle attacks - ## - insecureSkipVerify: false - ## path to certificate containing public key of CA authority - ## - caCert: "" - ## path to certificate containing public key of the user signed by CA authority - ## - userCert: "" - ## path to private key of the user - ## - userKey: "" - - ## version of Kafka broker - ## For 0.x it must be a string in the format - ## "major.minor.veryMinor.patch" example: 0.8.2.0 - ## For 1.x it must be a string in the format - ## "major.major.veryMinor" example: 2.0.1 - ## Should be >= 0.11.2.0 to enable Kafka record headers support - ## - # version: "0.11.2.0" - # The following components expose Prometheus metrics and have servicemonitors in this chart (disabled by default) # router, executor, storage svc serviceMonitor: @@ -656,7 +614,7 @@ preUpgradeChecks: image: fission/pre-upgrade-checks ## pre-install/pre-upgrade checks image version ## - imageTag: v1.20.0-rc1 + imageTag: v1.20.0-rc2 ## Fission post-install/post-upgrade reporting live in this image ## @@ -787,29 +745,29 @@ mqt_keda: enabled: true connector_images: kafka: - image: fission/keda-kafka-http-connector - tag: v0.12 + image: ghcr.io/fission/keda-kafka-http-connector + tag: v0.13 rabbitmq: - image: fission/keda-rabbitmq-http-connector - tag: v0.10 + image: ghcr.io/fission/keda-rabbitmq-http-connector + tag: v0.11 awskinesis: - image: fission/keda-aws-kinesis-http-connector - tag: v0.10 - aws_sqs: - image: fission/keda-aws-sqs-http-connector + image: ghcr.io/fission/keda-aws-kinesis-http-connector tag: v0.11 + aws_sqs: + image: ghcr.io/fission/keda-aws-sqs-http-connector + tag: v0.12 nats_steaming: - image: fission/keda-nats-streaming-http-connector - tag: v0.13 + image: ghcr.io/fission/keda-nats-streaming-http-connector + tag: v0.14 nats_jetstream: - image: fission/keda-nats-jetstream-http-connector - tag: v0.4 + image: ghcr.io/fission/keda-nats-jetstream-http-connector + tag: v0.5 gcp_pubsub: - image: fission/keda-gcp-pubsub-http-connector - tag: v0.6 + image: ghcr.io/fission/keda-gcp-pubsub-http-connector + tag: v0.7 redis: - image: fission/keda-redis-http-connector - tag: v0.3 + image: ghcr.io/fission/keda-redis-http-connector + tag: v0.4 ## Pod resources as: ## resources: