commit kubectl-directpv for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kubectl-directpv for openSUSE:Factory checked in at 2024-08-14 14:15:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubectl-directpv (Old) and /work/SRC/openSUSE:Factory/.kubectl-directpv.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubectl-directpv" Wed Aug 14 14:15:34 2024 rev:2 rq:1193752 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kubectl-directpv/kubectl-directpv.changes 2024-08-01 22:06:22.141266856 +0200 +++ /work/SRC/openSUSE:Factory/.kubectl-directpv.new.7232/kubectl-directpv.changes 2024-08-14 14:16:25.932505210 +0200 @@ -1,0 +2,13 @@ +Tue Aug 13 18:08:46 UTC 2024 - opensuse_buildservice@ojkastl.de + +- Update to version 4.1.0: + * Upgrade sidecar images (#920) + * Remove unsupported PodSecurityPolicy (#918) + +------------------------------------------------------------------- +Tue Aug 13 18:00:58 UTC 2024 - opensuse_buildservice@ojkastl.de + +- Update to version 4.0.13: + * Upgrade sidecar images (#922) + +------------------------------------------------------------------- Old: ---- directpv-4.0.12.obscpio New: ---- directpv-4.1.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubectl-directpv.spec ++++++ --- /var/tmp/diff_new_pack.HbYP3Q/_old 2024-08-14 14:16:27.172557049 +0200 +++ /var/tmp/diff_new_pack.HbYP3Q/_new 2024-08-14 14:16:27.176557216 +0200 @@ -1,7 +1,7 @@ # # spec file for package kubectl-directpv # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: kubectl-directpv -Version: 4.0.12 +Version: 4.1.0 Release: 0 Summary: Kubectl plugin for the MinIO CSI driver for Direct Attached Storage License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.HbYP3Q/_old 2024-08-14 14:16:27.204558386 +0200 +++ /var/tmp/diff_new_pack.HbYP3Q/_new 2024-08-14 14:16:27.208558553 +0200 @@ -3,20 +3,22 @@ <param name="url">https://github.com/minio/directpv</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v4.0.12</param> + <param name="revision">v4.1.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> </service> <service name="set_version" mode="manual"> </service> - <service name="tar" mode="buildtime"/> + <service name="go_modules" mode="manual"> + <param name="archive">directpv-4.1.0.obscpio</param> + </service> + <!-- services below are running at buildtime --> + <service name="tar" mode="buildtime"> + </service> <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">gz</param> </service> - <service name="go_modules" mode="manual"> - <param name="archive">directpv-4.0.12.obscpio</param> - </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.HbYP3Q/_old 2024-08-14 14:16:27.228559390 +0200 +++ /var/tmp/diff_new_pack.HbYP3Q/_new 2024-08-14 14:16:27.232559557 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/minio/directpv</param> - <param name="changesrevision">7d9939223470ee015a4122c8b4d0e0124feaefae</param></service></servicedata> + <param name="changesrevision">87975890af1ec749c2a80f989c38a506d3b78e96</param></service></servicedata> (No newline at EOF) ++++++ directpv-4.0.12.obscpio -> directpv-4.1.0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/cmd/kubectl-directpv/list_volumes.go new/directpv-4.1.0/cmd/kubectl-directpv/list_volumes.go --- old/directpv-4.0.12/cmd/kubectl-directpv/list_volumes.go 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/cmd/kubectl-directpv/list_volumes.go 2024-08-05 11:42:32.000000000 +0200 @@ -24,7 +24,6 @@ "github.com/jedib0t/go-pretty/v6/table" directpvtypes "github.com/minio/directpv/pkg/apis/directpv.min.io/types" "github.com/minio/directpv/pkg/consts" - "github.com/minio/directpv/pkg/k8s" "github.com/minio/directpv/pkg/types" "github.com/minio/directpv/pkg/utils" "github.com/spf13/cobra" @@ -146,7 +145,7 @@ } func getPVCName(ctx context.Context, volume types.Volume) string { - pv, err := k8s.KubeClient().CoreV1().PersistentVolumes().Get(ctx, volume.Name, metav1.GetOptions{}) + pv, err := adminClient.Kube().CoreV1().PersistentVolumes().Get(ctx, volume.Name, metav1.GetOptions{}) if err == nil && pv != nil && pv.Spec.ClaimRef != nil { return pv.Spec.ClaimRef.Name } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/docs/installation.md new/directpv-4.1.0/docs/installation.md --- old/directpv-4.0.12/docs/installation.md 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/docs/installation.md 2024-08-05 11:42:32.000000000 +0200 @@ -37,11 +37,11 @@ ### Prerequisites * Kubernetes >= v1.20 on GNU/Linux on amd64. * If you use private registry, below images must be pushed into your registry. You could use [this helper script](tools/push-images.sh) to do that. - - quay.io/minio/csi-node-driver-registrar:v2.8.0 - - quay.io/minio/csi-provisioner:v3.5.0 _(for Kubernetes >= v1.20)_ + - quay.io/minio/csi-node-driver-registrar:v2.11.1 + - quay.io/minio/csi-provisioner:v5.0.1 _(for Kubernetes >= v1.20)_ - quay.io/minio/csi-provisioner:v2.2.0-go1.18 _(for kubernetes < v1.20)_ - - quay.io/minio/livenessprobe:v2.10.0 - - quay.io/minio/csi-resizer:v1.8.0 + - quay.io/minio/livenessprobe:v2.13.1 + - quay.io/minio/csi-resizer:v1.11.2 - quay.io/minio/directpv:latest * If `seccomp` is enabled, load [DirectPV seccomp profile](../seccomp.json) on nodes where you want to install DirectPV and use `--seccomp-profile` flag to `kubectl directpv install` command. For more information, refer Kubernetes documentation [here](https://kubernetes.io/docs/tutorials/clusters/seccomp/) * If `apparmor` is enabled, load [DirectPV apparmor profile](../apparmor.profile) on nodes where you want to install DirectPV and use `--apparmor-profile` flag to `kubectl directpv install` command. For more information, refer to the [Kubernetes documentation](https://kubernetes.io/docs/tutorials/clusters/apparmor/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/docs/tools/install.sh new/directpv-4.1.0/docs/tools/install.sh --- old/directpv-4.0.12/docs/tools/install.sh 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/docs/tools/install.sh 2024-08-05 11:42:32.000000000 +0200 @@ -112,6 +112,10 @@ fi } +function is_psp_found() { + kubectl get --ignore-not-found=true psp directpv-min-io --no-headers -o NAME | grep -q . +} + function init() { help_flag=0 for arg in "$@"; do @@ -165,6 +169,13 @@ echo "kubectl directpv plugin not found; please install" exit 255 fi + + if is_psp_found; then + echo "[WARNING] Older PodSecurityPolicy found !!!" + echo "[WARNING] DirectPV removed PodSecurityPolicy support as per Kubernetes supportability" + echo "[WARNING] This installation does not change anything related to existing PodSecurityPolicy" + echo "[WARNING] You can remove it manually and use Pod Security Admission as per your requirement" + fi } function wait_for_crd() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/docs/tools/push-images.sh new/directpv-4.1.0/docs/tools/push-images.sh --- old/directpv-4.0.12/docs/tools/push-images.sh 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/docs/tools/push-images.sh 2024-08-05 11:42:32.000000000 +0200 @@ -63,11 +63,11 @@ } function main() { - push_image "quay.io/minio/csi-node-driver-registrar:v2.8.0" - push_image "quay.io/minio/csi-provisioner:v3.5.0" + push_image "quay.io/minio/csi-node-driver-registrar:v2.11.1" + push_image "quay.io/minio/csi-provisioner:v5.0.1" push_image "quay.io/minio/csi-provisioner:v2.2.0-go1.18" - push_image "quay.io/minio/livenessprobe:v2.10.0" - push_image "quay.io/minio/csi-resizer:v1.8.0" + push_image "quay.io/minio/livenessprobe:v2.13.1" + push_image "quay.io/minio/csi-resizer:v1.11.2" release=$(curl -sfL "https://api.github.com/repos/minio/directpv/releases/latest" | awk '/tag_name/ { print substr($2, 3, length($2)-4) }') push_image "quay.io/minio/directpv:v${release}" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/functests/multi-node-tests.sh new/directpv-4.1.0/functests/multi-node-tests.sh --- old/directpv-4.0.12/functests/multi-node-tests.sh 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/functests/multi-node-tests.sh 2024-08-05 11:42:32.000000000 +0200 @@ -295,7 +295,7 @@ fi EOF chmod a+x "${setup_sh}" - scp_cmd "${DIRECTPV_DIR}/CREDITS" "${DIRECTPV_DIR}/LICENSE" "${DIRECTPV_DIR}/centos.repo" "${DIRECTPV_DIR}/directpv" "${DIRECTPV_DIR}/kubectl-directpv" "${DIRECTPV_DIR}/Dockerfile" "${sleep_dockerfile}" "${setup_sh}" "root@${MASTER_VM_IP}:" + scp_cmd "${DIRECTPV_DIR}/CREDITS" "${DIRECTPV_DIR}/LICENSE" "${DIRECTPV_DIR}/AlmaLinux.repo" "${DIRECTPV_DIR}/directpv" "${DIRECTPV_DIR}/kubectl-directpv" "${DIRECTPV_DIR}/Dockerfile" "${sleep_dockerfile}" "${setup_sh}" "root@${MASTER_VM_IP}:" ssh_cmd "${MASTER_VM_IP}" "./${setup_sh}" if [ "${NODE_COUNT}" -eq 0 ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/go.mod new/directpv-4.1.0/go.mod --- old/directpv-4.0.12/go.mod 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/go.mod 2024-08-05 11:42:32.000000000 +0200 @@ -14,7 +14,7 @@ github.com/freddierice/go-losetup/v2 v2.0.1 github.com/google/uuid v1.6.0 github.com/jedib0t/go-pretty/v6 v6.5.9 - github.com/kubernetes-csi/csi-lib-utils v0.16.0 + github.com/kubernetes-csi/csi-lib-utils v0.18.1 github.com/minio/sha256-simd v1.0.1 github.com/mitchellh/go-homedir v1.1.0 github.com/prometheus/client_golang v1.19.1 @@ -24,13 +24,13 @@ golang.org/x/time v0.5.0 google.golang.org/grpc v1.65.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.28.11 - k8s.io/apiextensions-apiserver v0.28.11 - k8s.io/apimachinery v0.28.11 - k8s.io/client-go v0.28.11 + k8s.io/api v0.30.3 + k8s.io/apiextensions-apiserver v0.30.3 + k8s.io/apimachinery v0.30.3 + k8s.io/client-go v0.30.3 k8s.io/klog/v2 v2.130.1 - k8s.io/kube-openapi v0.0.0-20240709000949-962c6f1e0765 - k8s.io/pod-security-admission v0.28.11 + k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f + k8s.io/pod-security-admission v0.30.3 sigs.k8s.io/yaml v1.4.0 ) @@ -105,7 +105,7 @@ gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/component-base v0.28.11 // indirect + k8s.io/component-base v0.30.3 // indirect k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/go.sum new/directpv-4.1.0/go.sum --- old/directpv-4.0.12/go.sum 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/go.sum 2024-08-05 11:42:32.000000000 +0200 @@ -52,7 +52,8 @@ github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= @@ -91,8 +92,8 @@ github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes-csi/csi-lib-utils v0.16.0 h1:LXCvkhXHtFOkl7LoDqFdho/MuebccZqWxLwhKiRGiBg= -github.com/kubernetes-csi/csi-lib-utils v0.16.0/go.mod h1:fp1Oik+45tP2o4X9SD/SBWXLTQYT9wtLxGasBE3+vBI= +github.com/kubernetes-csi/csi-lib-utils v0.18.1 h1:vpg1kbQ6lFVCz7mY71zcqVE7W0GAQXXBoFfHvbW3gdw= +github.com/kubernetes-csi/csi-lib-utils v0.18.1/go.mod h1:PIcn27zmbY0KBue4JDdZVfDF56tjcS3jKroZPi+pMoY= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= @@ -130,10 +131,10 @@ github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= -github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= -github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= -github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= +github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -256,22 +257,22 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.11 h1:2qFr3jSpjy/9QirmlRP0LZeomexuwyRlE8CWUn9hPNY= -k8s.io/api v0.28.11/go.mod h1:nQSGyxQ2sbS73i1zEJyaktFvFfD72z/7nU+LqxzNnXk= -k8s.io/apiextensions-apiserver v0.28.11 h1:EbHGxLgPVupsobUhwY9kLYES0yRLn65fV/aAuW52+xo= -k8s.io/apiextensions-apiserver v0.28.11/go.mod h1:eKJx8UVKgeaqFZWdU39Q8bNOnv21aFK55+riFdUhAJg= -k8s.io/apimachinery v0.28.11 h1:Ovrx7IOkKSgFJn8+d5BXOC7POzP4i7kOAVlx46iRQ04= -k8s.io/apimachinery v0.28.11/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= -k8s.io/client-go v0.28.11 h1:YHtF6Bg4/DdYHHsx6f5Ti/0giwoo19t3DbBYYmo9xks= -k8s.io/client-go v0.28.11/go.mod h1:yi2BW8PQhFDLGmZ3WbyTJYX5J8YM6n3WUj1fvL7pJ4g= -k8s.io/component-base v0.28.11 h1:/CyCF+Mgb737LnvJ0pHxZHKnK/OPiXtxGBr9fcE82K4= -k8s.io/component-base v0.28.11/go.mod h1:GDfDeCmn5CKKfdqvSxFJEcyoiBYzujP2bMj1rU919Dc= +k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ= +k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04= +k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U= +k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4= +k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= +k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= +k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= +k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s= +k8s.io/component-base v0.30.3/go.mod h1:C1SshT3rGPCuNtBs14RmVD2xW0EhRSeLvBh7AGk1quA= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240709000949-962c6f1e0765 h1:2ew3670P0mKVdxKUO80QfVr8yW0nL/6DeXADxguoa1g= -k8s.io/kube-openapi v0.0.0-20240709000949-962c6f1e0765/go.mod h1:6uyuxUpeMJR3XnM2dWN/A6l46bSq43XHN2kOQG8eID0= -k8s.io/pod-security-admission v0.28.11 h1:PmlNJFuMmjXmwiYHjBwnsFJPwtfvCDhAe0jNcQgHzIw= -k8s.io/pod-security-admission v0.28.11/go.mod h1:GspkpEoW8Ddm/3DSnH/uURfyUYpyDhlqTWURdI7Gf2w= +k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f h1:2sXuKesAYbRHxL3aE2PN6zX/gcJr22cjrsej+W784Tc= +k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc= +k8s.io/pod-security-admission v0.30.3 h1:UDGZWR3ry/XrN/Ki/w7qrp49OwgQsKyh+6xWbexvJi8= +k8s.io/pod-security-admission v0.30.3/go.mod h1:T1EQSOLl9YyDMnXNJfsq2jeci6uoymY0mrRkkKihd98= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/pkg/admin/installer/args.go new/directpv-4.1.0/pkg/admin/installer/args.go --- old/directpv-4.0.12/pkg/admin/installer/args.go 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/pkg/admin/installer/args.go 2024-08-05 11:42:32.000000000 +0200 @@ -30,24 +30,25 @@ ) const ( - // csiProvisionerImage = csi-provisioner:v3.5.0 - csiProvisionerImage = "csi-provisioner@sha256:7b5c070ec70d30b0895d91b10c39a0e6cc81c18e0d1566c77aeff2a3587fa316" - openshiftCSIProvisionerImage = "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:778aa6e5ea046bfcd865e665679c30362dc8c00cfb33a0cdcc56b2395e8ab504" - + // csiProvisionerImage = csi-provisioner:v5.0.1 + csiProvisionerImage = "csi-provisioner@sha256:acf6e876a3fc5f367ea3ad5aeb2ce16c47b051cb853d8b2c5fb498c51166726e" // csiProvisionerImageV2_2_0 = "csi-provisioner:v2.2.0-go1.18" csiProvisionerImageV2_2_0 = "csi-provisioner@sha256:c185db49ba02c384633165894147f8d7041b34b173e82a49d7145e50e809b8d6" - - // nodeDriverRegistrarImage = csi-node-driver-registrar:v2.8.0 - nodeDriverRegistrarImage = "csi-node-driver-registrar@sha256:c805fdc166761218dc9478e7ac8e0ad0e42ad442269e75608823da3eb761e67e" - openshiftNodeDriverRegistrarImage = "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:0db5ea72a708503516f33f221848f0adaee71901769699ef5322a79e2da4f6d1" - - // livenessProbeImage = livenessprobe:v2.10.0 - livenessProbeImage = "livenessprobe@sha256:f3bc9a84f149cd7362e4bd0ae8cd90b26ad020c2591bfe19e63ff97aacf806c3" - openshiftLivenessProbeImage = "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:81f9f06a7de9a79013a4690ad616c1aff9638ab64284626491f44645a07051ec" - - // csiResizerImage = csi-resizer:v1.8.0 - csiResizerImage = "csi-resizer@sha256:819f68a4daf75acec336302843f303cf360d4941249f9f5019ffbb690c8ac7c0" - openshiftCSIResizerImage = "registry.redhat.io/openshift4/ose-csi-external-resizer-rhel8@sha256:837b32a0c432123e2605ad6d029e7f3b4489d9c52a9d272c7a133d41ad10db87" + // nodeDriverRegistrarImage = csi-node-driver-registrar:v2.11.1 + nodeDriverRegistrarImage = "csi-node-driver-registrar@sha256:7cd4053e52c0028bd9c711ca6de667a7c459a024679ae967c7f800e81baec0bf" + // livenessProbeImage = livenessprobe:v2.13.1 + livenessProbeImage = "livenessprobe@sha256:4106724032620c7679bf065e6e11c7d841cf1d9db69c5e33514a6139681d0689" + // csiResizerImage = csi-resizer:v1.11.2 + csiResizerImage = "csi-resizer@sha256:33f6fd174f2dc121c0e87176856cc36b25374737c5441bccb5b3679905df7ab9" + + // openshiftCSIProvisionerImage = openshift4/ose-csi-external-provisioner-rhel8:v4.12.0-202407151105.p0.g3aa7c52.assembly.stream.el8 + openshiftCSIProvisionerImage = "registry.redhat.io/openshift4/ose-csi-external-provisioner-rhel8@sha256:8bf8aa8975790e19ba107fd58699f98389e3fb692d192f4df3078fff7f0a4bba" + // openshiftNodeDriverRegistrarImage = openshift4/ose-csi-node-driver-registrar-rhel8:v4.12.0-202407151105.p0.gc316b89.assembly.stream.el8 + openshiftNodeDriverRegistrarImage = "registry.redhat.io/openshift4/ose-csi-node-driver-registrar-rhel8@sha256:ab54e6a2e8a6a1ca2da5aaf25f784c09f5bf22ea32224ec1bdb6c564f88695a9" + // openshiftLivenessProbeImage = openshift4/ose-csi-livenessprobe-rhel8:v4.12.0-202407151105.p0.ge6545e7.assembly.stream.el8 + openshiftLivenessProbeImage = "registry.redhat.io/openshift4/ose-csi-livenessprobe-rhel8@sha256:b28029f929fe2a28e666910d1acc57c3474fabdb2f9129688ef1ca56c7231d90" + // openshiftCSIResizerImage = openshift4/ose-csi-external-resizer-rhel8:v4.12.0-202407151105.p0.g5b066ba.assembly.stream.el8 + openshiftCSIResizerImage = "registry.redhat.io/openshift4/ose-csi-external-resizer-rhel8@sha256:bed8de36bac80108909205342b2d92e4de5adbfa33bf13f9346236fca52a0d3e" ) // Args represents DirectPV installation arguments. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/pkg/admin/installer/installer.go new/directpv-4.1.0/pkg/admin/installer/installer.go --- old/directpv-4.0.12/pkg/admin/installer/installer.go 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/pkg/admin/installer/installer.go 2024-08-05 11:42:32.000000000 +0200 @@ -30,7 +30,6 @@ return []Task{ namespaceTask{client}, rbacTask{client}, - pspTask{client}, crdTask{client}, migrateTask{client, legacyClient}, csiDriverTask{client}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/pkg/admin/installer/psp.go new/directpv-4.1.0/pkg/admin/installer/psp.go --- old/directpv-4.0.12/pkg/admin/installer/psp.go 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/pkg/admin/installer/psp.go 1970-01-01 01:00:00.000000000 +0100 @@ -1,228 +0,0 @@ -// This file is part of MinIO DirectPV -// Copyright (c) 2021, 2022 MinIO, Inc. -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. - -package installer - -import ( - "context" - "errors" - - directpvtypes "github.com/minio/directpv/pkg/apis/directpv.min.io/types" - "github.com/minio/directpv/pkg/client" - "github.com/minio/directpv/pkg/consts" - corev1 "k8s.io/api/core/v1" - policy "k8s.io/api/policy/v1beta1" - rbac "k8s.io/api/rbac/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -const pspClusterRoleBindingName = "psp-" + consts.Identity - -var errPSPUnsupported = errors.New("pod security policy is not supported in your kubernetes version") - -type pspTask struct { - client *client.Client -} - -func (pspTask) Name() string { - return "PSP" -} - -func (pspTask) Start(ctx context.Context, args *Args) error { - if !sendStartMessage(ctx, args.ProgressCh, 2) { - return errSendProgress - } - return nil -} - -func (pspTask) End(ctx context.Context, args *Args, err error) error { - if !sendEndMessage(ctx, args.ProgressCh, err) { - return errSendProgress - } - return nil -} - -func (t pspTask) Execute(ctx context.Context, args *Args) error { - return t.createPSP(ctx, args) -} - -func (t pspTask) Delete(ctx context.Context, _ *Args) error { - major, minor, err := t.client.K8s().GetKubeVersion() - if err != nil { - return err - } - podSecurityAdmission := (major == 1 && minor > 24) - if podSecurityAdmission { - return nil - } - return t.deletePSP(ctx) -} - -func (t pspTask) createPSPClusterRoleBinding(ctx context.Context, args *Args) (err error) { - if !sendProgressMessage(ctx, args.ProgressCh, "Creating psp cluster role binding", 2, nil) { - return errSendProgress - } - defer func() { - if err == nil { - if !sendProgressMessage(ctx, args.ProgressCh, "Created psp cluster role binding", 2, clusterRoleBindingComponent(pspClusterRoleBindingName)) { - err = errSendProgress - } - } - }() - crb := &rbac.ClusterRoleBinding{ - TypeMeta: metav1.TypeMeta{ - APIVersion: "rbac.authorization.k8s.io/v1", - Kind: "ClusterRoleBinding", - }, - ObjectMeta: metav1.ObjectMeta{ - Name: pspClusterRoleBindingName, - Namespace: metav1.NamespaceNone, - Annotations: map[string]string{ - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, - Labels: defaultLabels, - }, - Subjects: []rbac.Subject{ - { - Kind: "Group", - APIGroup: "rbac.authorization.k8s.io", - Name: "system:serviceaccounts:" + consts.Identity, - }, - }, - RoleRef: rbac.RoleRef{ - APIGroup: "rbac.authorization.k8s.io", - Kind: "ClusterRole", - Name: consts.Identity, - }, - } - - if !args.DryRun && !args.Declarative { - _, err = t.client.Kube().RbacV1().ClusterRoleBindings().Create(ctx, crb, metav1.CreateOptions{}) - if err != nil && !apierrors.IsAlreadyExists(err) { - return err - } - } - - return args.writeObject(crb) -} - -func (t pspTask) createPodSecurityPolicy(ctx context.Context, args *Args) (err error) { - if !sendProgressMessage(ctx, args.ProgressCh, "Creating pod security policy", 1, nil) { - return errSendProgress - } - defer func() { - if err == nil { - if !sendProgressMessage(ctx, args.ProgressCh, "Created pod security policy", 1, podSecurityPolicyComponent(consts.Identity)) { - err = errSendProgress - } - } - }() - psp := &policy.PodSecurityPolicy{ - TypeMeta: metav1.TypeMeta{ - APIVersion: "policy/v1beta1", - Kind: "PodSecurityPolicy", - }, - ObjectMeta: metav1.ObjectMeta{ - Name: consts.Identity, - Namespace: metav1.NamespaceNone, - Annotations: map[string]string{ - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, - Labels: defaultLabels, - }, - Spec: policy.PodSecurityPolicySpec{ - Privileged: true, - HostPID: true, - HostIPC: false, - AllowedCapabilities: []corev1.Capability{policy.AllowAllCapabilities}, - Volumes: []policy.FSType{policy.HostPath}, - AllowedHostPaths: []policy.AllowedHostPath{ - {PathPrefix: "/proc", ReadOnly: true}, - {PathPrefix: consts.SysDirVolumePath}, - {PathPrefix: consts.UdevDataDir, ReadOnly: true}, - {PathPrefix: consts.AppRootDir}, - {PathPrefix: csiDirVolumePath}, - {PathPrefix: kubeletDirPath}, - }, - SELinux: policy.SELinuxStrategyOptions{ - Rule: policy.SELinuxStrategyRunAsAny, - }, - RunAsUser: policy.RunAsUserStrategyOptions{ - Rule: policy.RunAsUserStrategyRunAsAny, - }, - SupplementalGroups: policy.SupplementalGroupsStrategyOptions{ - Rule: policy.SupplementalGroupsStrategyRunAsAny, - }, - FSGroup: policy.FSGroupStrategyOptions{ - Rule: policy.FSGroupStrategyRunAsAny, - }, - }, - } - - if !args.DryRun && !args.Declarative { - _, err = t.client.Kube().PolicyV1beta1().PodSecurityPolicies().Create( - ctx, psp, metav1.CreateOptions{}, - ) - if err != nil && !apierrors.IsAlreadyExists(err) { - return err - } - } - - return args.writeObject(psp) -} - -func (t pspTask) createPSP(ctx context.Context, args *Args) error { - if args.podSecurityAdmission { - return nil - } - var gvk *schema.GroupVersionKind - if !args.DryRun { - var err error - if gvk, err = t.client.K8s().GetGroupVersionKind("policy", "PodSecurityPolicy", "v1beta1"); err != nil { - return err - } - } else { - gvk = &schema.GroupVersionKind{Version: "v1beta1"} - } - - if gvk.Version == "v1beta1" { - if err := t.createPodSecurityPolicy(ctx, args); err != nil { - return err - } - return t.createPSPClusterRoleBinding(ctx, args) - } - - return errPSPUnsupported -} - -func (t pspTask) deletePSP(ctx context.Context) error { - err := t.client.Kube().RbacV1().ClusterRoleBindings().Delete( - ctx, pspClusterRoleBindingName, metav1.DeleteOptions{}, - ) - if err != nil && !apierrors.IsNotFound(err) { - return err - } - - err = t.client.Kube().PolicyV1beta1().PodSecurityPolicies().Delete( - ctx, consts.Identity, metav1.DeleteOptions{}, - ) - if err != nil && !apierrors.IsNotFound(err) { - return err - } - return nil -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/directpv-4.0.12/pkg/admin/installer/utils.go new/directpv-4.1.0/pkg/admin/installer/utils.go --- old/directpv-4.0.12/pkg/admin/installer/utils.go 2024-07-26 06:46:33.000000000 +0200 +++ new/directpv-4.1.0/pkg/admin/installer/utils.go 2024-08-05 11:42:32.000000000 +0200 @@ -109,13 +109,6 @@ } } -func podSecurityPolicyComponent(name string) *Component { - return &Component{ - Name: name, - Kind: "PodSecurityPolicy", - } -} - func crdComponent(name string) *Component { return &Component{ Name: name, ++++++ directpv.obsinfo ++++++ --- /var/tmp/diff_new_pack.HbYP3Q/_old 2024-08-14 14:16:27.556573102 +0200 +++ /var/tmp/diff_new_pack.HbYP3Q/_new 2024-08-14 14:16:27.560573269 +0200 @@ -1,5 +1,5 @@ name: directpv -version: 4.0.12 -mtime: 1721969193 -commit: 7d9939223470ee015a4122c8b4d0e0124feaefae +version: 4.1.0 +mtime: 1722850952 +commit: 87975890af1ec749c2a80f989c38a506d3b78e96 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/kubectl-directpv/vendor.tar.gz /work/SRC/openSUSE:Factory/.kubectl-directpv.new.7232/vendor.tar.gz differ: char 5, line 1
participants (1)
-
Source-Sync