Hello community, here is the log from the commit of package rook for openSUSE:Factory checked in at 2020-09-25 16:20:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rook (Old) and /work/SRC/openSUSE:Factory/.rook.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rook" Fri Sep 25 16:20:53 2020 rev:19 rq:836113 version:1.4.3+git18.g42e1675e Changes: -------- --- /work/SRC/openSUSE:Factory/rook/rook.changes 2020-08-14 09:30:40.896317006 +0200 +++ /work/SRC/openSUSE:Factory/.rook.new.4249/rook.changes 2020-09-25 16:21:02.443332891 +0200 @@ -1,0 +2,99 @@ +Mon Sep 21 13:42:16 UTC 2020 - Stefan Haas <[email protected]> + +- fixed spec-file: + * operator.yaml does not get changed to use the SUSE-images + +------------------------------------------------------------------- +Thu Sep 17 17:59:23 UTC 2020 - Mike Latimer <[email protected]> + +- helm chart, manifests: + * fixed tolerations + * Update SUSE documentation URL in NOTES.txt + +------------------------------------------------------------------- +Thu Sep 17 04:50:13 UTC 2020 - Mike Latimer <[email protected]> + +- ceph: fix drive group deployment failure (bsc#1176170) +- helm chart, manifests: + * Add tolerations to cluster & CRDs + * Require kubeVersion >= 1.11 + * Use rbac.authorization.k8s.io/v1 + * Add affinities for label schema + * Set Rook log level to DEBUG + * Remove FlexVolume agent + * Require currentNamespaceOnly=true + * Replace NOTES.txt with SUSE specific version + +------------------------------------------------------------------- +Tue Sep 15 14:25:51 UTC 2020 - Mike Latimer <[email protected]> + +- Include operator and common yamls in manifest package + +------------------------------------------------------------------- +Sat Sep 12 00:49:38 UTC 2020 - Mike Latimer <[email protected]> + +- Update to v1.4.3 + * The Ceph-CSI driver was being unexpectedly removed by the garbage + collector in some clusters. For more details to apply a fix during + the upgrade to this patch release, see these steps. (#616) + * Add storageClassDeviceSet label to osd pods (#6225) + * DNS suffix issue for OBCs in custom DNS suffix clusters (#6234) + * Cleanup mon canary pvc if the failover failed (#6224) + * Only enable mgr init container if the dashboard is enabled (#6198) + * cephobjectstore monitoring goroutine must be stopped during + uninstall (#6208) + * Remove NParts and Cache_Size from MDCACHE block in the NFS + configuration (#6207) + * Purge a down osd with a job created by the admin (#6127) + * Do not use label selector on external mgr service (#6142) + * Allow uninstall even if volumes still exist with a new CephCluster + setting (#6145) + +------------------------------------------------------------------- +Fri Sep 10 21:16:34 UTC 2020 - Mike Latimer <[email protected]> + +- Update to v1.4.2 + - Patch release focusing on small feature additions and bug fixes. + * Improve check for LVM on the host to allow installing of OSDs (#6175) + * Set the OSD prepare resource limits (#6118) + * Allow memory limits below recommended settings (#6116) + * Use full DNS suffix for object endpoint with OBCs (#6170) + * Remove the CSI driver lifecycle preStop hook (#6141) + * External cluster optional settings for provisioners (#6048) + * Operator watches nodes that match OSD placement rules (#6156) + * Allow user to add labels to the cluster daemon pods (#6084 #6082) + * Fix vulnerability in package golang.org/x/text (#6136) + * Add expansion support for encrypted osd on pvc (#6126) + * Do not use realPath for OSDs on PVCs (#6120, @leseb) + * Example object store manifests updated for consistency (#6123) + * Separate topology spread constrinats for osd prepare jobs and + osd daemons (#6103) + * Pass CSI resources as strings in the helm chart (#6104) + * Improve callCephVolume() for list and prepare (#6059) + * Improved multus support for the CSI driver configuration (#5740) + * Object store healthcheck yaml examples (#6090) + * Add support for wal encrypted device on pvc (#6062) + * Updated helm usage in documentation (#6086) + * More details for RBD Mirroring documentation (#6083) +- Build process changes: + - Set CSI sidecar versions through _service, and set all versions in + code through a single patch file + + csi-images-SUSE.patch + - csi-dummy-images.patch + - Use github.com/SUSE/rook and suse-release-1.4 tag in update.sh + - Create module dependencies through _service, and store these dependencies + in vendor.tar.gz (replacing rook-[version]-vendor.tar.xz) + - Modify build commands to include "-mod=vendor" to use new vendor tarball + - Add CSI sidecars as BuildRequires, in order to determine versions through + _service process + - Replace %setup of vendor tarball with a simple tar extraction + - Move registry detection to %prep, and set correct registry through a + search and replace on the SUSE_REGISTRY string + - Use variables to track rook, ceph and cephcsi versions + - Add '#!BuildTag', and 'appVersion' to chart.yaml + - Add required versioning to helm chart + - Leave ceph-csi templates in /etc, and include them in main rook package. + - csi-template-paths.patch + - Include only designated yaml examples in rook-k8s-yaml package + +------------------------------------------------------------------- Old: ---- csi-dummy-images.patch csi-template-paths.patch rook-1.4.0+git0.g801c5934-vendor.tar.xz rook-1.4.0+git0.g801c5934.tar.xz New: ---- SUSE-helm-notes.txt csi-images-SUSE.patch rook-1.4.3+git18.g42e1675e.tar.gz vendor.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rook.spec ++++++ --- /var/tmp/diff_new_pack.CeNLFK/_old 2020-09-25 16:21:05.715335787 +0200 +++ /var/tmp/diff_new_pack.CeNLFK/_new 2020-09-25 16:21:05.715335787 +0200 @@ -17,15 +17,16 @@ Name: rook -Version: 1.4.0+git0.g801c5934 +Version: 1.4.3+git18.g42e1675e Release: 0 Summary: Orchestrator for distributed storage systems in cloud-native environments License: Apache-2.0 Group: System/Filesystems URL: https://rook.io/ -Source0: %{name}-%{version}.tar.xz -Source1: %{name}-%{version}-vendor.tar.xz +Source0: %{name}-%{version}.tar.gz +Source1: vendor.tar.gz +Source97: SUSE-helm-notes.txt Source98: README Source99: update-tarball.sh @@ -33,13 +34,10 @@ # upstream source is updated without the package maintainers knowing. Patches reduce user error when # creating a new SUSE release branch of Rook. -# Change CSI images to dummy value that needs to be replaced at link time. Use dummy patch so that -# upstream changes will cause build failures if there are updates maintainers miss manually. -Patch0: csi-dummy-images.patch -# Change CSI template paths to match those installed by rook-k8s-manifests -Patch1: csi-template-paths.patch +# Change CSI images to SUSE specific values. +Patch0: csi-images-SUSE.patch # Change the default FlexVolume dir path to support Kubic. -Patch2: flexvolume-dir.patch +Patch1: flexvolume-dir.patch %if 0%{?suse_version} # _insert_obs_source_lines_here @@ -58,8 +56,13 @@ # Ceph version is needed to set correct container tag in manifests BuildRequires: ceph -# ceph-csi driver version is needed to update manifest with it +# ceph-csi and sidecars are needed to update versions in manifest/chart BuildRequires: ceph-csi +BuildRequires: csi-external-attacher +BuildRequires: csi-external-provisioner +BuildRequires: csi-external-resizer +BuildRequires: csi-external-snapshotter +BuildRequires: csi-node-driver-registrar # Rook runtime requirements - referenced from packages installed in Rook images # From images/ceph/Dockerfile @@ -149,47 +152,62 @@ %prep %setup -q -n %{name} -%setup -q -n %{name} -T -D -b 1 # unpack Source1, don't delete what was unpacked before +tar zxf %{SOURCE1} %patch0 -p1 %patch1 -p1 -%patch2 -p1 # determine image names to use in manifests depending on the base os type -# %CEPH_VERSION% is replaced at build time by the _service -%global rook_container_version 1.4.0.0 # this is updated by update-tarball.sh +# %CEPH_VERSION%, and all CSI sidecar versions are replaced at build time by _service +%global rook_container_version 1.4.3.18 # this is updated by update-tarball.sh %if 0%{?is_opensuse} -%global rook_image registry.opensuse.org/opensuse/rook/ceph:%{rook_container_version}.%{release} -%global ceph_image registry.opensuse.org/opensuse/ceph/ceph:%CEPH_VERSION% -%global ceph_csi_image registry.opensuse.org/opensuse/cephcsi/cephcsi:%CSI_VERSION%.%CSI_OFFSET% +%define registry registry.opensuse.org/opensuse %else # is SES %if 0%{?sle_version} >= 150200 -%global rook_image registry.suse.com/ses/7/rook/ceph:%{rook_container_version}.%{release} -%global ceph_image registry.suse.com/ses/7/ceph/ceph:%CEPH_VERSION% -%global ceph_csi_image registry.suse.com/ses/7/cephcsi/cephcsi:%CSI_VERSION%.%CSI_OFFSET% +%define registry registry.suse.com/ses/7 %else -%global rook_image registry.suse.com/ses/6/rook/ceph:%{rook_container_version}.%{release} -%global ceph_image registry.suse.com/ses/6/ceph/ceph:%CEPH_VERSION% -%global ceph_csi_image registry.suse.com/ses/6/cephcsi/cephcsi:%CSI_VERSION%.%CSI_OFFSET% +%define registry registry.suse.com/ses/6 %endif %endif +%define spec_go pkg/operator/ceph/csi/spec.go +%define chart_yaml cluster/charts/rook-ceph/Chart.yaml +%define values_yaml cluster/charts/rook-ceph/values.yaml +sed -i -e "s|\(.*\)SUSE_REGISTRY\(.*\)|\1%{registry}\2|" %{spec_go} +sed -i -e "s|\(.*\)SUSE_REGISTRY\(.*\)|\1%{registry}\2|" %{chart_yaml} +sed -i -e "s|\(.*\)SUSE_REGISTRY\(.*\)|\1%{registry}\2|" %{values_yaml} + +%global rook_image %{registry}/rook/ceph:%{rook_container_version}.%{release} +%global ceph_image %{registry}/ceph/ceph:%CEPH_VERSION% +%global ceph_csi_image %{registry}/cephcsi/cephcsi:v%CSI_VERSION%.%CSI_OFFSET% +%global csi_reg_image %{registry}/cephcsi/csi-node-driver-registrar:v%CSI_REG_VERSION% +%global csi_prov_image %{registry}/cephcsi/csi-provisioner:v%CSI_PROV_VERSION% +%global csi_attach_image %{registry}/cephcsi/csi-attacher:v%CSI_ATTACH_VERSION% +%global csi_snap_image %{registry}/cephcsi/csi-snapshotter:v%CSI_SNAP_VERSION% +%global csi_resize_image %{registry}/cephcsi/csi-resizer:v%CSI_RESIZE_VERSION% + %build -# we need to remove unsupported by Rook symbols from version -version_parsed=%{version} -version_parsed="${version_parsed//[+]/-}" +# remove symbols unsupported by k8s (+) from version +version_full=%{version} +version_noplus="${version_full//[+]/_}" +%global version_parsed "${version_noplus}-%{release}" linker_flags=( # Set Rook version - absolutely required - "-X" "github.com/rook/rook/pkg/version.Version=$version_parsed" + "-X" "github.com/rook/rook/pkg/version.Version=%{version_parsed}" # CSI images only known at build time, so use a linker flag instead of patch + # NOTE - This currently doesn't seem to work without also patching spec.go "-X" "github.com/rook/rook/pkg/operator/ceph/csi.DefaultCSIPluginImage=%{ceph_csi_image}" + "-X" "github.com/rook/rook/pkg/operator/ceph/csi.DefaultRegistrarImage=%{csi_reg_image}" + "-X" "github.com/rook/rook/pkg/operator/ceph/csi.DefaultProvisionerImage=%{csi_prov_image}" + "-X" "github.com/rook/rook/pkg/operator/ceph/csi.DefaultAttacherImage=%{csi_attach_image}" + "-X" "github.com/rook/rook/pkg/operator/ceph/csi.DefaultSnapshotterImage=%{csi_snap_image}" + "-X" "github.com/rook/rook/pkg/operator/ceph/csi.DefaultResizerImage=%{csi_resize_image}" ) -build_flags=("-ldflags" "${linker_flags[*]}") +build_flags=("-ldflags" "${linker_flags[*]}" "-mod=vendor") %goprep github.com/rook/rook -mv %{_builddir}/pkg %{_builddir}/go/ %gobuild "${build_flags[@]}" cmd/rook %gobuild "${build_flags[@]}" cmd/rookflex @@ -209,7 +227,7 @@ # and flags to get rid of RPMLINT report warnings/errors: # -buildmode=pie (position-independent executable) GOPATH=%{_builddir}/go GOBIN="${GOPATH}"/bin \ - go test -v -x -buildmode=pie -c \ + go test -v -x -buildmode=pie -c -mod=vendor\ -o %{_builddir}/go/bin/rook-integration github.com/rook/rook/tests/integration %install @@ -229,30 +247,47 @@ --target-directory="${install_location}" \ images/ceph/toolbox.sh -# Install provided yaml files to download and run the Rook operator and Ceph containers +# Install selected yaml files to download and run the Rook operator and Ceph containers mkdir -p %{buildroot}%{_datadir}/k8s-yaml/rook/ceph -cp -pr cluster/examples/kubernetes/ceph/* %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/ +install_yamls='ceph-client cluster cluster-on-pvc cluster-with-drive-groups common dashboard-external-http + dashboard-external-https dashboard-ingress-https dashboard-loadbalancer filesystem + filesystem-ec object-bucket-claim-delete object-bucket-claim-retain object-ec object-user + operator pool pool-ec rgw-external toolbox toolbox-job' +for file in ${install_yamls}; do + cp -pr cluster/examples/kubernetes/ceph/${file}.yaml %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/ +done +# Include ceph/csi directory, but move templates to /etc +cp -pr cluster/examples/kubernetes/ceph/csi %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/ +mkdir -p %{buildroot}%{_sysconfdir}/ceph-csi +mv %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/csi/template/* %{buildroot}%{_sysconfdir}/ceph-csi/ +rmdir %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/csi/template ################################################################################ # Check that linker flags are applied ################################################################################ -rook_bin="$rook_bin_location"rook +# re-set version variables to match those used in the build step +# remove symbols unsupported by k8s (+) from version +version_full=%{version} +version_noplus="${version_full//[+]/_}" +%global version_parsed "${version_noplus}-%{release}" +# strip off everything following + for the helm appVersion +%global helm_appVersion "${version_full%+*}" -# Check Rook version is set +# Check Rook version is properly set +rook_bin="$rook_bin_location"rook bin_version="$("$rook_bin" version)" -version_parsed=%{version} -version_parsed="${version_parsed//[+]/-}" -if [[ ! "$bin_version" =~ "$version_parsed" ]]; then + +if [[ ! "$bin_version" =~ "$version" ]]; then echo "Rook version not set correctly!" exit 1 fi # Check Ceph CSI default image is set -if grep --binary --text dummy-value-that-should-be-replaced-at-link-time "$rook_bin"; then +if grep -q --binary --text quay.io "$rook_bin"; then echo "Default CSI image was not set!" exit 1 fi -if ! grep --binary --text "%{ceph_csi_image}" "$rook_bin"; then +if ! grep -q --binary --text "%{ceph_csi_image}" "$rook_bin"; then echo "Default CSI image was set to wrong value!" exit 1 fi @@ -261,16 +296,22 @@ # Update manifests with images coming from Build Service ################################################################################ # set rook, ceph and ceph-csi container versions -sed -i -e "s|image: .*|image: %{rook_image}|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/operator* -sed -i -e "s|\".*/cephcsi/cephcsi:.*|\"%{ceph_csi_image}\"|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/operator* sed -i -e "s|image: .*|image: %{ceph_image}|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/cluster* sed -i -e "s|image: .*|image: %{rook_image}|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/toolbox* +sed -i -e "s|image: .*|image: %{rook_image}|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/operator* sed -i -e "s|/usr/local/bin/toolbox.sh|%{_bindir}/toolbox.sh|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/toolbox* # Install the helm charts +%define chart_yaml "%{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator/Chart.yaml" +%define values_yaml "%{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator/values.yaml" mkdir -p %{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator cp -pr cluster/charts/rook-ceph/* %{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator -sed -i -e "s|\".*/cephcsi/cephcsi:.*|\"%{ceph_csi_image}\"|g" %{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator/values.yaml +sed -i -e "1 i\#!BuildTag: rook-ceph:"%{version_parsed} %{chart_yaml} +# appVersion should being with a 'v', even though the image tag currently does not +sed -i -e "/apiVersion/a appVersion: v%{helm_appVersion}" %{chart_yaml} +sed -i -e "s|\(.*tag: \)VERSION|\1%{helm_appVersion}|" %{values_yaml} +# Install SUSE specific helm chart NOTES.txt +cp %SOURCE97 %{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator/templates/NOTES.txt # For the integration test tooling, store files with the current Rook and Ceph image names # These files can be cat'ed to get these without needing to do special processing @@ -279,7 +320,6 @@ echo -n %{rook_image} > %{rook_integration_dir}/rook-image-name echo -n %{ceph_image} > %{rook_integration_dir}/ceph-image-name echo -n %{ceph_csi_image} > %{rook_integration_dir}/ceph-csi-image-name -for f in %{rook_integration_dir}/*; do cat "$f"; done ################################################################################ # Specify which files we built belong to each package @@ -289,6 +329,7 @@ %defattr(-,root,root,-) %{_bindir}/rook %{_bindir}/toolbox.sh +%config %{_sysconfdir}/ceph-csi # rook-rookflex-version-build.arch.rpm %files rookflex ++++++ SUSE-helm-notes.txt ++++++ The Rook Operator has been installed. Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app=rook-ceph-operator" ************************************************************************************************* **** CREATING A CEPH CLUSTER **** ************************************************************************************************* After confirming the Rook Operator is running properly, the Ceph cluster can be deployed through YAML files which describe the desired state of the cluster. Sample YAML configuration files are included in the 'rook-k8s-yaml' package provided with SUSE Enterprise Storage 7. If installed (on an admin workstation or CaaSP master node) the sample YAML files can be found in the /usr/share/k8s-yaml/rook/ceph directory structure. Further documentation can be found in the 'Deploying and Administering Ceph on SUSE CaaS Platform' guide. This is under active development, but can be seen at the following URL: https://susedoc.github.io/doc-ses/master/single-html/ses-rook/ NOTE: The sample configuration files can serve as templates for production deployments. Whether creating entirely new configuration files or modifying the provided samples, ensure the following requirements are met: - The CephCluster resource must be customized to meet deployment needs. - The CephCluster must be deployed in its own namespace (samples default to 'rook-ceph'). - At this time, only one Ceph cluster per Kubernetes cluster is supported. - Role Based Access Control (RBAC) roles and role bindings must be configured. - This helm chart includes the required RBAC configuration to create a CephCluster CRD in the same namespace. - Any disk devices added to the cluster must be empty (no filesystem or partitions). - Disk devices must be referenced using their devnode name (e.g. '/dev/sdb' or '/dev/xvde') Additional upstream documentation may be found at: - https://rook.github.io/docs/rook/master/ceph-quickstart.html - https://github.com/rook/rook/blob/master/cluster/examples/kubernetes/ceph/cluster.yaml ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CeNLFK/_old 2020-09-25 16:21:05.779335844 +0200 +++ /var/tmp/diff_new_pack.CeNLFK/_new 2020-09-25 16:21:05.779335844 +0200 @@ -17,4 +17,79 @@ <param name="parse-version">offset</param> <param name="package">ceph-csi</param> </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">csi-images-SUSE.patch</param> + <param name="regex">%CSI_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">ceph-csi</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">csi-images-SUSE.patch</param> + <param name="regex">%CSI_OFFSET%</param> + <param name="parse-version">offset</param> + <param name="package">ceph-csi</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">csi-images-SUSE.patch</param> + <param name="regex">%CSI_REG_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-node-driver-registrar</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">rook.spec</param> + <param name="regex">%CSI_REG_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-node-driver-registrar</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">csi-images-SUSE.patch</param> + <param name="regex">%CSI_PROV_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-external-provisioner</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">rook.spec</param> + <param name="regex">%CSI_PROV_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-external-provisioner</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">csi-images-SUSE.patch</param> + <param name="regex">%CSI_SNAP_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-external-snapshotter</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">rook.spec</param> + <param name="regex">%CSI_SNAP_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-external-snapshotter</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">csi-images-SUSE.patch</param> + <param name="regex">%CSI_ATTACH_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-external-attacher</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">rook.spec</param> + <param name="regex">%CSI_ATTACH_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-external-attacher</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">csi-images-SUSE.patch</param> + <param name="regex">%CSI_RESIZE_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-external-resizer</param> + </service> + <service name="replace_using_package_version" mode="buildtime"> + <param name="file">rook.spec</param> + <param name="regex">%CSI_RESIZE_VERSION%</param> + <param name="parse-version">patch</param> + <param name="package">csi-external-resizer</param> + </service> + <service name="go_modules" mode="disabled"> + <!-- <param name="compression">xz</param> --> + </service> </services> ++++++ csi-images-SUSE.patch ++++++ Index: rook/pkg/operator/ceph/csi/spec.go =================================================================== --- rook.orig/pkg/operator/ceph/csi/spec.go +++ rook/pkg/operator/ceph/csi/spec.go @@ -97,12 +97,12 @@ var ( // manually challenging. var ( // image names - DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.1.0" - DefaultRegistrarImage = "quay.io/k8scsi/csi-node-driver-registrar:v1.2.0" - DefaultProvisionerImage = "quay.io/k8scsi/csi-provisioner:v1.6.0" - DefaultAttacherImage = "quay.io/k8scsi/csi-attacher:v2.1.0" - DefaultSnapshotterImage = "quay.io/k8scsi/csi-snapshotter:v2.1.1" - DefaultResizerImage = "quay.io/k8scsi/csi-resizer:v0.4.0" + DefaultCSIPluginImage = "SUSE_REGISTRY/cephcsi/cephcsi:v%CSI_VERSION%.%CSI_OFFSET%" + DefaultRegistrarImage = "SUSE_REGISTRY/cephcsi/csi-node-driver-registrar:v%CSI_REG_VERSION%" + DefaultProvisionerImage = "SUSE_REGISTRY/cephcsi/csi-provisioner:v%CSI_PROV_VERSION%" + DefaultAttacherImage = "SUSE_REGISTRY/cephcsi/csi-attacher:v%CSI_ATTACH_VERSION%" + DefaultSnapshotterImage = "SUSE_REGISTRY/cephcsi/csi-snapshotter:v%CSI_SNAP_VERSION%" + DefaultResizerImage = "SUSE_REGISTRY/cephcsi/csi-resizer:v%CSI_RESIZE_VERSION%" ) const ( Index: rook/cluster/charts/rook-ceph/values.yaml =================================================================== --- rook.orig/cluster/charts/rook-ceph/values.yaml +++ rook/cluster/charts/rook-ceph/values.yaml @@ -4,7 +4,7 @@ image: prefix: rook - repository: rook/ceph + repository: SUSE_REGISTRY/rook/ceph tag: VERSION pullPolicy: IfNotPresent @@ -256,17 +256,17 @@ csi: #rbdLivenessMetricsPort: 9080 #kubeletDirPath: /var/lib/kubelet #cephcsi: - #image: quay.io/cephcsi/cephcsi:v3.1.0 + #image: SUSE_REGISTRY/cephcsi/cephcsi:v%CSI_VERSION%.%CSI_OFFSET% #registrar: - #image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0 + #image: SUSE_REGISTRY/cephcsi/csi-node-driver-registrar:v%CSI_REG_VERSION% #provisioner: - #image: quay.io/k8scsi/csi-provisioner:v1.6.0 + #image: SUSE_REGISTRY/cephcsi/csi-provisioner:v%CSI_PROV_VERSION% #snapshotter: - #image: quay.io/k8scsi/csi-snapshotter:v2.1.1 + #image: SUSE_REGISTRY/cephcsi/csi-snapshotter:v%CSI_SNAP_VERSION% #attacher: - #image: quay.io/k8scsi/csi-attacher:v2.1.0 + #image: SUSE_REGISTRY/cephcsi/csi-attacher:v%CSI_ATTACH_VERSION% #resizer: - #image: quay.io/k8scsi/csi-resizer:v0.4.0 + #image: SUSE_REGISTRY/cephcsi/csi-resizer:v%CSI_RESIZE_VERSION% enableFlexDriver: false enableDiscoveryDaemon: true ++++++ update-tarball.sh ++++++ --- /var/tmp/diff_new_pack.CeNLFK/_old 2020-09-25 16:21:05.811335872 +0200 +++ /var/tmp/diff_new_pack.CeNLFK/_new 2020-09-25 16:21:05.811335872 +0200 @@ -2,8 +2,10 @@ set -xEeuo pipefail -ROOK_REPO="github.com/rook/rook" -ROOK_REV="v1.4.0" +#ROOK_REPO="github.com/rook/rook" +#ROOK_REV="v1.4.0" +ROOK_REPO="github.com/SUSE/rook" +ROOK_REV="suse-release-1.4" if ! command -V go; then @@ -11,12 +13,6 @@ exit 1 fi -if ! command -V dep; -then - echo "ERROR: could not find dep binary" - exit 1 -fi - if ! command -V git; then echo "ERROR: could not find git binary" @@ -75,20 +71,17 @@ # make primary source tarball before changing anything in the repo cd $PKG_DIR -tar -C "$GOPATH_ROOK/.." -cJf rook-$VERSION.tar.xz rook/ - -# make vendor tarball -cd "$GOPATH_ROOK" - -echo "Getting dependencies...might take a while" -GOPATH=$WORK_DIR make mod.check - -cd $PKG_DIR -tar -C "$WORK_DIR" -cJf rook-$VERSION-vendor.tar.xz pkg - +#mv $GOPATH_ROOK/rook $GOPATH_ROOK/rook-$RELEASE +#tar -C "$GOPATH_ROOK" -czf rook-$RELEASE.tar.gz rook-$RELEASE/ +#tar -C "$GOPATH_ROOK/.." -cJf rook-$VERSION.tar.xz rook/ +tar -C "$GOPATH_ROOK/.." -czf rook-$VERSION.tar.gz rook/ # update spec file versions +#sed -i "s/^Version:.*/Version: $RELEASE/" rook.spec sed -i "s/^Version:.*/Version: $VERSION/" rook.spec sed -i "s/^%global rook_container_version .*/%global rook_container_version ${RELEASE}.$GIT_COMMIT_NUM # this is updated by update-tarball.sh/" rook.spec +# make vendor tarball +osc -A https://api.suse.de service disabledrun + echo "Finished successfully!"
