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

feat: make hostNetwork configurable #107

Merged
merged 4 commits into from
Jan 12, 2024
Merged

feat: make hostNetwork configurable #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f67ff6
feat: make `hostNetwork` configurable
vadasambar Jan 11, 2024
572f104
chore: update `VERSION` in the `Makefile`
vadasambar Jan 11, 2024
5af0fcf
chore: replace `hostNetwork: true` with `hostNetwork: false`
vadasambar Jan 11, 2024
28cdf2d
fix: template substituion for `hostNetwork`
vadasambar Jan 12, 2024
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION ?= v1.0.0
VERSION ?= v1.0.1

IMAGE_BUILDER ?= docker
IMAGE_BUILD_CMD ?= buildx
Expand Down
4 changes: 2 additions & 2 deletions charts/warm-metal-csi-driver/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ 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.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0.0
version: 1.0.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: v1.0.0
appVersion: v1.0.1
2 changes: 1 addition & 1 deletion charts/warm-metal-csi-driver/templates/nodeplugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
- mountPath: {{ .Values.crioMountProgram }}
name: crio-mount-program
{{- end }}
hostNetwork: true
hostNetwork: {{.Values.csiPlugin.hostNetwork}}
serviceAccountName: {{ include "warm-metal-csi-driver.fullname" . }}-nodeplugin
volumes:
- hostPath:
Expand Down
1 change: 1 addition & 0 deletions charts/warm-metal-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ enableAsyncPullMount: false
pullImageSecretForDaemonset:

csiPlugin:
hostNetwork: false
resources: {}
image:
tag: ""
Expand Down
2 changes: 1 addition & 1 deletion cmd/install/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ spec:
labels:
app: csi-image-warm-metal
spec:
hostNetwork: true
hostNetwork: false
serviceAccountName: csi-image-warm-metal
containers:
- name: node-driver-registrar
Expand Down
3 changes: 2 additions & 1 deletion pkg/pullexecutor/pullexecutor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ func (m *PullExecutor) StartPulling(o *PullOptions) error {
c, cancel := context.WithTimeout(context.Background(), pullCtxTimeout)
defer cancel()

if pullstatus.Get(o.NamedRef) == pullstatus.StillPulling {
if pullstatus.Get(o.NamedRef) == pullstatus.StillPulling ||
pullstatus.Get(o.NamedRef) == pullstatus.Pulled {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a fix for what appears to be a race condition when I was testing #81
Basically when two requests sent back-to-back with little time duration between them, one of them succeeds while the other goes into the mutex section and continues to pull the same image again (if pullAlways: true). I haven't seen this issue outside #81 but thought it would be good to get the fix in before we get #81 merged.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Good catch!

return
}

Expand Down
2 changes: 1 addition & 1 deletion sample/install/cri-o.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ spec:
- mountPath: /run/containers/storage
mountPropagation: Bidirectional
name: crio-run-root
hostNetwork: true
hostNetwork: false
serviceAccountName: csi-image-warm-metal
volumes:
- hostPath:
Expand Down
2 changes: 1 addition & 1 deletion sample/install/k3s-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
- mountPath: /var/lib/rancher/k3s/agent/containerd/io.containerd.snapshotter.v1.overlayfs
mountPropagation: Bidirectional
name: snapshot-root-0
hostNetwork: true
hostNetwork: false
serviceAccountName: csi-image-warm-metal
volumes:
- hostPath:
Expand Down
2 changes: 1 addition & 1 deletion sample/install/minikube-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ spec:
- mountPath: /mnt/vda1/var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
mountPropagation: Bidirectional
name: snapshot-root-0
hostNetwork: true
hostNetwork: false
serviceAccountName: csi-image-warm-metal
volumes:
- hostPath:
Expand Down
2 changes: 1 addition & 1 deletion sample/install/snap-microk8s-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
- mountPath: /var/snap/microk8s/common/var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
mountPropagation: Bidirectional
name: snapshot-root-0
hostNetwork: true
hostNetwork: false
serviceAccountName: csi-image-warm-metal
volumes:
- hostPath:
Expand Down
Loading