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.

Sign up for GitHub

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

Add log-level to operator helm chart #3117

Merged
merged 5 commits into from
Apr 30, 2021
Merged

Add log-level to operator helm chart #3117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
240c706
feat: allow users to specify manager log level in Helm chart
ellisvalentiner Feb 12, 2021
2cd0d88
docs: documentation for manager log level
ellisvalentiner Feb 12, 2021
53bc0a5
Merge branch 'master' of https://github.com/ellisvalentiner/seldon-co…
ukclivecox Apr 8, 2021
0039e12
Add log level to operator
ukclivecox Apr 8, 2021
e385641
Merge branch 'master' into ellisvalentiner-master
ukclivecox Apr 29, 2021
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
1 change: 1 addition & 0 deletions helm-charts/seldon-core-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
| manager.cpuRequest | string | `"100m"` | |
| manager.memoryLimit | string | `"300Mi"` | |
| manager.memoryRequest | string | `"200Mi"` | |
| manager.logLevel | string | `"INFO"` | |
| managerCreateResources | bool | `false` | |
| managerUserID | int | `8888` | |
| namespaceOverride | string | `""` | |
Expand Down
3 changes: 3 additions & 0 deletions helm-charts/seldon-core-operator/templates/deployment_seldon-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ spec:
- --enable-leader-election
- --webhook-port={{ .Values.webhook.port }}
- --create-resources=$(MANAGER_CREATE_RESOURCES)
- --log-level=$(MANAGER_LOG_LEVEL)
- '{{- if .Values.singleNamespace }}--namespace={{ include "seldon.namespace" . }}{{- end }}'
command:
- /manager
env:
- name: MANAGER_LOG_LEVEL
value: '{{ .Values.manager.logLevel }}'
- name: WATCH_NAMESPACE
value: ''
- name: RELATED_IMAGE_EXECUTOR
Expand Down
28 changes: 14 additions & 14 deletions helm-charts/seldon-core-operator/templates/webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,6 @@
{{- $cert := genSignedCert "seldon-webhook-service" nil $altNames 365 $ca -}}
---

{{- if not .Values.certManager.enabled -}}
apiVersion: v1
data:
ca.crt: '{{ $ca.Cert | b64enc }}'
tls.crt: '{{ $cert.Cert | b64enc }}'
tls.key: '{{ $cert.Key | b64enc }}'
kind: Secret
metadata:
name: seldon-webhook-server-cert
namespace: '{{ include "seldon.namespace" . }}'
type: kubernetes.io/tls
{{- end }}
---

apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
Expand Down Expand Up @@ -184,5 +170,19 @@ webhooks:
resources:
- seldondeployments
sideEffects: None
---

{{- if not .Values.certManager.enabled -}}
apiVersion: v1
data:
ca.crt: '{{ $ca.Cert | b64enc }}'
tls.crt: '{{ $cert.Cert | b64enc }}'
tls.key: '{{ $cert.Key | b64enc }}'
kind: Secret
metadata:
name: seldon-webhook-server-cert
namespace: '{{ include "seldon.namespace" . }}'
type: kubernetes.io/tls
{{- end }}

{{- end }}
1 change: 1 addition & 0 deletions helm-charts/seldon-core-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ manager:
cpuRequest: 100m
memoryLimit: 300Mi
memoryRequest: 200Mi
logLevel: INFO
rbac:
configmap:
create: true
Expand Down
3 changes: 3 additions & 0 deletions operator/config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ spec:
- --enable-leader-election
- --webhook-port=4443
- --create-resources=$(MANAGER_CREATE_RESOURCES)
- --log-level=$(MANAGER_LOG_LEVEL)
env:
- name: MANAGER_LOG_LEVEL
value: "INFO"
- name: WATCH_NAMESPACE
value: ""
- name: RELATED_IMAGE_EXECUTOR
Expand Down
1 change: 1 addition & 0 deletions operator/helm/split_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"ENGINE_DEFAULT_CPU_REQUEST": "engine.resources.cpuRequest",
"ENGINE_DEFAULT_MEMORY_LIMIT": "engine.resources.memoryLimit",
"ENGINE_DEFAULT_MEMORY_REQUEST": "engine.resources.memoryRequest",
"MANAGER_LOG_LEVEL": "manager.logLevel",
}
HELM_VALUES_IMAGE_PULL_POLICY = "{{ .Values.image.pullPolicy }}"

Expand Down