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

Jump to bottom

Feature/kube v1.25.x #201

Merged
merged 7 commits into from
Dec 27, 2023
Merged

Feature/kube v1.25.x #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d31bdb9
Remove PodSecurityPolicy
antmoveh Dec 15, 2023
d3588c3
upgrade go mod depend
antmoveh Dec 18, 2023
6d0b6a8
upgrade go mod depend
antmoveh Dec 18, 2023
e4edbec
upgrade kubernetes-csi image
antmoveh Dec 18, 2023
609cf49
add the csidriver role
antmoveh Dec 18, 2023
288d73f
remove ioutil package
antmoveh Dec 19, 2023
b1d34d0
fix mount check
antmoveh Dec 19, 2023
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
68 changes: 0 additions & 68 deletions charts/templates/csi-controller-psp.yaml
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions charts/templates/csi-node-psp.yaml
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions controllers/suite_test.go
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions debug/hack/csi-provisioner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ sudo chmod 775 /dev/carina
#docker
docker rm -f csi-provisioner

docker run --name csi-provisioner -d -e KUBECONFIG=/root/.kube/config -v /root/.kube:/root/.kube -v /tmp/csi:/csi:rw carina/csi-provisioner:v2.2.2 \
docker run --name csi-provisioner -d -e KUBECONFIG=/root/.kube/config -v /root/.kube:/root/.kube -v /tmp/csi:/csi:rw carina/csi-provisioner:v3.4.1 \
--csi-address=unix:///csi/csi-provisioner.sock --v=5 --timeout=150s --leader-election=true --retry-interval-start=500ms \
--feature-gates=Topology=true --extra-create-metadata=true

docker rm -f csi-resizer

docker run --name csi-resizer -d -v /root/.kube:/root/.kube -v /tmp/csi:/csi:rw carina/csi-resizer:v1.5.0 \
docker run --name csi-resizer -d -v /root/.kube:/root/.kube -v /tmp/csi:/csi:rw carina/csi-resizer:v1.7.0 \
--csi-address=unix:///csi/csi-provisioner.sock --v=5 --timeout=150s --leader-election=true --retry-interval-start=500ms \
--handle-volume-inuse-error=false --kubeconfig=/root/.kube/config
7 changes: 5 additions & 2 deletions deploy/kubernetes/carina-scheduler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ rules:
- apiGroups: [""]
resources: ["nodes"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["namespaces"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["pods"]
verbs: ["delete", "get", "list", "watch", "update"]
Expand Down Expand Up @@ -37,7 +40,7 @@ rules:
resources: ["configmaps"]
verbs: ["get", "list", "watch"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses", "csinodes"]
resources: ["storageclasses", "csinodes", "csidrivers", "csistoragecapacities"]
verbs: ["get", "list", "watch"]
- apiGroups: ["coordination.k8s.io"]
resources: ["leases"]
Expand Down Expand Up @@ -114,7 +117,7 @@ spec:
labels:
component: carina-scheduler
spec:
serviceAccount: carina-scheduler-sa
serviceAccountName: carina-scheduler-sa
priorityClassName: system-cluster-critical
containers:
- name: carina-scheduler
Expand Down
8 changes: 4 additions & 4 deletions deploy/kubernetes/csi-carina-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ spec:
labels:
app: csi-carina-provisioner
spec:
serviceAccount: carina-csi-controller
serviceAccountName: carina-csi-controller
containers:
- name: csi-provisioner
image: registry.cn-hangzhou.aliyuncs.com/carina/csi-provisioner:v2.2.2
image: registry.cn-hangzhou.aliyuncs.com/carina/csi-provisioner:v3.4.1
args:
- "--csi-address=/csi/csi-carina.sock"
- "--v=5"
Expand All @@ -41,7 +41,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-resizer
image: registry.cn-hangzhou.aliyuncs.com/carina/csi-resizer:v1.5.0
image: registry.cn-hangzhou.aliyuncs.com/carina/csi-resizer:v1.7.0
args:
- "--csi-address=/csi/csi-carina.sock"
- "--v=5"
Expand Down Expand Up @@ -118,7 +118,7 @@ spec:
- name: certs
mountPath: /certs
- name: liveness-probe
image: registry.cn-hangzhou.aliyuncs.com/carina/livenessprobe:v2.7.0
image: registry.cn-hangzhou.aliyuncs.com/carina/livenessprobe:v2.9.0
imagePullPolicy: "IfNotPresent"
args:
- --csi-address=/csi/csi-carina.sock
Expand Down
8 changes: 4 additions & 4 deletions deploy/kubernetes/csi-carina-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
labels:
app: csi-carina-node
spec:
serviceAccount: carina-csi-node
serviceAccountName: carina-csi-node
# resolved through k8s service, set dns policy to cluster first
dnsPolicy: ClusterFirstWithHostNet
initContainers:
Expand All @@ -36,7 +36,7 @@ spec:
# created by privileged CSI driver container.
securityContext:
privileged: true
image: registry.cn-hangzhou.aliyuncs.com/carina/csi-node-driver-registrar:v2.5.1
image: registry.cn-hangzhou.aliyuncs.com/carina/csi-node-driver-registrar:v2.7.0
args:
- "--v=5"
- "--csi-address=/csi/csi-carina.sock"
Expand Down Expand Up @@ -126,8 +126,8 @@ spec:
- name: log-dir
mountPath: /var/log/carina/
- name: liveness-probe
image: registry.cn-hangzhou.aliyuncs.com/carina/livenessprobe:v2.7.0
imagePullPolicy:
image: registry.cn-hangzhou.aliyuncs.com/carina/livenessprobe:v2.9.0
imagePullPolicy: "IfNotPresent"
args:
- --csi-address=/csi/csi-carina.sock
volumeMounts:
Expand Down
Loading
Loading