Skip to content

Commit

Permalink
Changes necessary to move to Ansible Operator SDK 1.x (#3)
Browse files Browse the repository at this point in the history
* Changes necessary to move to Ansible Operator SDK 1.0
part of: kiali/kiali#2983

* OPERATOR_NAME is deprecated - use the new cmdline opt
  • Loading branch information
jmazzitelli committed Mar 16, 2021
1 parent 2d2ed0b commit c17ed65
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
9 changes: 3 additions & 6 deletions kiali-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ spec:
image: "{{ .Values.image.repo }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
args:
- "--zap-level=info"
- "--zap-log-level=info"
- "--leader-election-id={{ include "kiali-operator.fullname" . }}"
volumeMounts:
- mountPath: /tmp/ansible-operator/runner
name: runner
Expand All @@ -57,8 +58,6 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: OPERATOR_NAME
value: {{ include "kiali-operator.fullname" . }}
- name: ANSIBLE_DEBUG_LOGS
value: {{ .Values.debug.enabled | quote }}
- name: ANSIBLE_VERBOSITY_KIALI_KIALI_IO
Expand All @@ -74,9 +73,7 @@ spec:
{{- end }}
ports:
- name: http-metrics
containerPort: 8383
- name: cr-metrics
containerPort: 8686
containerPort: 8080
{{- if .Values.resources }}
resources:
{{- toYaml .Values.resources | nindent 10 }}
Expand Down
2 changes: 1 addition & 1 deletion kiali-operator/templates/kiali-cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
labels:
{{- include "kiali-operator.labels" . | nindent 4 }}
annotations:
ansible.operator-sdk/verbosity: {{ .Values.debug.verbosity | quote }}
ansible.sdk.operatorframework.io/verbosity: {{ .Values.debug.verbosity | quote }}
spec:
{{- toYaml .Values.cr.spec | nindent 2 }}
...
Expand Down

0 comments on commit c17ed65

Please sign in to comment.