Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added missing attributes and improvements to deployment yaml file and… #14

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keda/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
.project
.idea/
*.tmproj
.vscode/
.vscode/
21 changes: 19 additions & 2 deletions keda/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
apiVersion: v1
name: keda
description: Event based autoscaler for Azure Functions deployments on Kubernetes

# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
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: 1.1.0
appVersion: "1.1.0"

# 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: 1.1.0

home: https://github.com/kedacore/keda
icon: https://raw.githubusercontent.com/kedacore/keda/master/images/keda-logo-500x500-white.png
sources:
- https://github.com/kedacore/keda
maintainers:
- name: Ahmed ElSayed
email: ahmels@microsoft.com
email: ahmels@microsoft.com
2 changes: 1 addition & 1 deletion keda/crds/keda.k8s.io_triggerauthentications_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ spec:
versions:
- name: v1alpha1
served: true
storage: true
storage: true
26 changes: 13 additions & 13 deletions keda/templates/api_service.yaml → keda/templates/apiservice.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: apiregistration.k8s.io/v1beta1
kind: APIService
metadata:
name: v1beta1.external.metrics.k8s.io
spec:
service:
name: {{ .Values.operatorName }}
namespace: {{ .Release.Namespace }}
group: external.metrics.k8s.io
version: v1beta1
insecureSkipTLSVerify: true
groupPriorityMinimum: 100
versionPriority: 100
apiVersion: apiregistration.k8s.io/v1beta1
kind: APIService
metadata:
name: v1beta1.external.metrics.k8s.io
spec:
service:
name: {{ .Values.operatorName }}
namespace: {{ .Release.Namespace }}
group: external.metrics.k8s.io
version: v1beta1
insecureSkipTLSVerify: true
groupPriorityMinimum: 100
versionPriority: 100
File renamed without changes.
60 changes: 43 additions & 17 deletions keda/templates/operator.yaml → keda/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: {{ .Values.operatorName }}
name: {{ .Values.operatorName }}
namespace: {{ .Release.Namespace }}
labels:
app: {{ .Values.operatorName }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand All @@ -18,14 +18,22 @@ spec:
aadpodidbinding: {{ .Values.aadPodIdentity }}
{{- end }}
spec:
serviceAccountName: {{ .Values.operatorName }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ .Values.serviceAccount.name }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: {{ .Values.operatorName }}
image: "{{ .Values.image.keda }}"
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.keda }}:{{ .Chart.AppVersion }}"
command:
- keda
args:
- '--zap-level={{ .Values.logLevel }}'
- "--zap-level={{ .Values.logLevel }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: WATCH_NAMESPACE
Expand All @@ -41,30 +49,48 @@ spec:
- name: grpc-certs
mountPath: /grpccerts
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
- name: {{ .Values.operatorName }}-metrics-apiserver
image: {{ .Values.image.metricsAdapter }}
image: "{{ .Values.image.metricsAdapter }}:{{ .Chart.AppVersion }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok for you if we add this @ahmelsayed? It's fine for me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer if there is a way to override the full image name because it enables using helm for deploying a custom keda. like this

imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: WATCH_NAMESPACE
value: ""
args:
- /usr/local/bin/keda-adapter
- --secure-port=6443
- --logtostderr=true
- --v=0
- /usr/local/bin/keda-adapter
- --secure-port=6443
- --logtostderr=true
- --v=0
ports:
- containerPort: 6443
name: https
- containerPort: 8080
name: http
- containerPort: {{ .Values.service.portHttpsTarget }}
name: https
protocol: TCP
- containerPort: {{ .Values.service.portHttpTarget }}
name: http
protocol: TCP
{{- if .Values.grpcTLSCertsSecret }}
volumeMounts:
- name: grpc-certs
mountPath: /grpccerts
{{- end }}
{{- if .Values.grpcTLSCertsSecret }}
volumes:
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.grpcTLSCertsSecret }}
volumes:
- name: grpc-certs
secret:
secretName: {{ .Values.grpcTLSCertsSecret }}
{{- end }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
Loading