Skip to content

Commit

Permalink
fix: sync ovn chart upstream patch (#2021)
Browse files Browse the repository at this point in the history
this error has been revealed by #1983 Good to have this go unit test in CI soon
Moved to local patch https://review.opendev.org/c/openstack/openstack-helm-infra/+/893739/10
  • Loading branch information
okozachenko1203 committed Oct 25, 2024
1 parent f93b4f4 commit 3bdf3bb
Show file tree
Hide file tree
Showing 6 changed files with 427 additions and 23 deletions.
4 changes: 0 additions & 4 deletions .charts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,6 @@ charts:
version: 0.1.13
repository: *openstack_helm_infra_repository
dependencies: *openstack_helm_dependencies
patches:
gerrit:
review.opendev.org:
- 893739
- name: placement
version: 0.3.9
repository: *openstack_helm_repository
Expand Down
12 changes: 7 additions & 5 deletions charts/ovn/templates/daemonset-controller-gw.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ spec:
mountPath: /var/run/ovn
- name: run-openvswitch
mountPath: /var/run/openvswitch
- name: shared
mountPath: /var/log/ovn/
- name: logs
mountPath: /var/log/ovn
{{- if .Values.pod.sidecars.vector }}
- name: vector
{{ tuple $envAll "vector" | include "helm-toolkit.snippets.image" | indent 10 }}
Expand All @@ -123,7 +123,7 @@ spec:
volumeMounts:
- name: vector-config
mountPath: /etc/vector
- name: shared
- name: logs
mountPath: /logs
- name: vector-data
mountPath: /var/lib/vector
Expand Down Expand Up @@ -170,8 +170,10 @@ spec:
secret:
secretName: {{ $configMapName }}
defaultMode: 0444
- name: shared
emptyDir: {}
- name: logs
hostPath:
path: /var/log/ovn
type: DirectoryOrCreate
{{- if .Values.pod.sidecars.vector }}
- name: vector-config
secret:
Expand Down
1 change: 0 additions & 1 deletion charts/ovn/templates/daemonset-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ spec:
- name: controller-init
{{ dict "envAll" $envAll "application" "ovn_controller" "container" "controller_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
{{ tuple $envAll "ovn_controller" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ dict "envAll" $envAll "application" "ovn_controller" "container" "controller_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
command:
- /tmp/ovn-controller-init.sh
env:
Expand Down
Loading

0 comments on commit 3bdf3bb

Please sign in to comment.