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

[linstor-csi-plugin] add topology logic patch #229

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+849 −3
Open

[linstor-csi-plugin] add topology logic patch #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .werf/consts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{{- $_ := set $ "BASE_ALPINE_DEV" "registry.deckhouse.io/base_images/dev-alpine:3.16.3@sha256:c706fa83cc129079e430480369a3f062b8178cac9ec89266ebab753a574aca8e" }}
{{- $_ := set $ "BASE_ALT_P11" "registry.deckhouse.io/base_images/alt:p11@sha256:c396cd7348a48f9236413e2ef5569223c15e554c0a3ca37f9d92fb787d4f1893" }}
{{- $_ := set $ "BASE_GOLANG_1_22" "registry.deckhouse.io/base_images/golang:1.22.7-bullseye@sha256:e5dc67bf84590c008338a0e30f56a6ed2092a38e0d2895c797dd501db73a2330" }}
{{- $_ := set . "BASE_GOLANG_1_23" "registry.deckhouse.io/base_images/golang:1.23.6-bookworm@sha256:ca569d98545ab5a090449da29d637fb3f5a273d3a002554af328be9873777cef" }}
{{- $_ := set $ "BASE_PYTHON" "registry.deckhouse.io/base_images/python:3.7.16-alpine3.16@sha256:054c898ee5eacb0b3d85bdb603d6229b93619964cc01be5274acdf3e451e5ef8" }}
{{- $_ := set $ "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:653ae76965c98c8cd1c8c9ff7725316d2983986f896655b30e0f44d2f8b2dd7e" }}

Expand Down
0 images/linstor-csi/patches/requisites.patch → ...linstor-csi/patches/0001-requisites.patch
View file
Open in desktop
File renamed without changes.
0 ...or-csi/patches/rename-linbit-labels.patch → ...i/patches/0002-rename-linbit-labels.patch
View file
Open in desktop
File renamed without changes.
0 ...es/linstor-csi/patches/new-csi-path.patch → ...nstor-csi/patches/0003-new-csi-path.patch
View file
Open in desktop
File renamed without changes.
790 changes: 790 additions & 0 deletions images/linstor-csi/patches/0004-linstor-csi-plugin-add-new-patch.patch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion images/linstor-csi/werf.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image: {{ $.ImageName }}-golang-artifact
from: {{ $.Root.BASE_GOLANG_1_22 }}
from: {{ $.Root.BASE_GOLANG_1_23 }}
final: false
git:
- url: {{ $.Root.SOURCE_REPO }}/linbit/linstor-csi
Expand Down
4 changes: 2 additions & 2 deletions templates/linstor-csi/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ spec:
terminationMessagePolicy: File
restartPolicy: Always
schedulerName: default-scheduler
serviceAccount: default
serviceAccountName: default
serviceAccount: linstor-csi-node
serviceAccountName: linstor-csi-node
terminationGracePeriodSeconds: 30
volumes:
- hostPath:
Expand Down
55 changes: 55 additions & 0 deletions templates/linstor-csi/rbac-for-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,56 @@
{{- include "helm_lib_csi_controller_rbac" . }}
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: linstor-csi-node
namespace: d8-{{ .Chart.Name }}
{{- include "helm_lib_module_labels" (list . (dict "app" "linstor-csi-node")) | nindent 2 }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: d8:{{ .Chart.Name }}:storagepool-reader
{{- include "helm_lib_module_labels" (list . (dict "app" "linstor-csi-controller")) | nindent 2 }}
rules:
- apiGroups: ["storage.deckhouse.io"]
resources: ["replicatedstoragepools", "lvmvolumegroups"]
verbs: ["get", "list", "watch"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: d8:{{ .Chart.Name }}:storagepool-reader-binding
{{- include "helm_lib_module_labels" (list . (dict "app" "linstor-csi-controller")) | nindent 2 }}
subjects:
- kind: ServiceAccount
name: csi
namespace: d8-sds-replicated-volume
roleRef:
kind: ClusterRole
name: d8:{{ .Chart.Name }}:storagepool-reader
apiGroup: rbac.authorization.k8s.io
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: d8:{{ .Chart.Name }}:rsc-watcher
{{- include "helm_lib_module_labels" (list . (dict "app" "linstor-csi-controller")) | nindent 2 }}
rules:
- apiGroups: ["storage.deckhouse.io"]
resources: ["replicatedstorageclasses"]
verbs: ["get", "list", "watch"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: d8:{{ .Chart.Name }}:rsc-read-access
{{- include "helm_lib_module_labels" (list . (dict "app" "linstor-csi-controller")) | nindent 2 }}
subjects:
- kind: ServiceAccount
name: csi
namespace: d8-sds-replicated-volume
roleRef:
kind: ClusterRole
name: d8:{{ .Chart.Name }}:rsc-watcher
apiGroup: rbac.authorization.k8s.io
Loading