diff --git a/build.env b/build.env index 9336bfc82f3..8a762063428 100644 --- a/build.env +++ b/build.env @@ -9,14 +9,14 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=canary +CSI_IMAGE_VERSION=v3.8.0 # Ceph version to use -BASE_IMAGE=quay.io/ceph/ceph:v17 +BASE_IMAGE=gcr.io/spectro-common-dev/medha/ubi8/fips-ceph:v17.2.6 CEPH_VERSION=quincy # standard Golang options -GOLANG_VERSION=1.19.5 +GOLANG_VERSION=1.20.10 GO111MODULE=on # commitlint version @@ -45,7 +45,7 @@ CHANGE_MINIKUBE_NONE_USER=true # Rook options ROOK_VERSION=v1.10.9 # Provide ceph image path -ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v17 +ROOK_CEPH_CLUSTER_IMAGE=gcr.io/spectro-common-dev/medha/ubi8/fips-ceph:v17.2.6 # CSI sidecar version CSI_ATTACHER_VERSION=v4.0.0 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index dfcb2787cd3..2e483fda4ec 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -94,7 +94,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: v3.8.0 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index f7f2be2b47c..45f4a90734a 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -117,7 +117,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: v3.8.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephcsi/image/Dockerfile b/deploy/cephcsi/image/Dockerfile index 6023c904c03..85fa437c7d9 100644 --- a/deploy/cephcsi/image/Dockerfile +++ b/deploy/cephcsi/image/Dockerfile @@ -4,8 +4,7 @@ ARG BASE_IMAGE FROM ${BASE_IMAGE} as updated_base -RUN dnf -y update \ - && dnf clean all \ +RUN dnf clean all \ && rm -rf /var/cache/yum FROM updated_base as builder @@ -17,25 +16,19 @@ ARG CSI_IMAGE_VERSION=canary ARG GO_ARCH ARG SRC_DIR ARG GIT_COMMIT -ARG GOROOT=/usr/local/go +ARG GOROOT=/usr/lib/golang COPY build.env / - +RUN dnf install -y go-toolset RUN source /build.env && \ - ( test -n "${GO_ARCH}" && exit 0; echo -e "\n\nMissing GO_ARCH argument for building image, install Golang or run: make image-cephcsi GOARCH=amd64\n\n"; exit 1 ) && \ - mkdir -p ${GOROOT} && \ - curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${GO_ARCH}.tar.gz | tar xzf - -C ${GOROOT} --strip-components=1 + ( test -n "${GO_ARCH}" && exit 0; echo -e "\n\nMissing GO_ARCH argument for building image, install Golang or run: make image-cephcsi GOARCH=amd64\n\n"; exit 1 ) # test if the downloaded version of Golang works (different arch?) RUN ${GOROOT}/bin/go version && ${GOROOT}/bin/go env # TODO: remove the following cmd, when issue # https://github.com/ceph/ceph-container/issues/2034 is fixed. -RUN dnf config-manager --disable \ - tcmu-runner,tcmu-runner-source,tcmu-runner-noarch || true - RUN dnf -y install --nodocs \ - librados-devel librbd-devel \ /usr/bin/cc \ make \ git \ @@ -46,6 +39,7 @@ RUN dnf -y install --nodocs \ ENV GOROOT=${GOROOT} \ GOPATH=/go \ CGO_ENABLED=1 \ + GOEXPERIMENT=boringcrypto \ GIT_COMMIT="${GIT_COMMIT}" \ ENV_CSI_IMAGE_VERSION="${CSI_IMAGE_VERSION}" \ ENV_CSI_IMAGE_NAME="${CSI_IMAGE_NAME}" \ diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 0d805771c1c..015ec698c56 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -95,7 +95,7 @@ spec: mountPath: /csi - name: csi-cephfsplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -143,7 +143,7 @@ spec: - name: ceph-csi-encryption-kms-config mountPath: /etc/ceph-csi-encryption-kms-config/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 95a831ff820..ce9ce8a3f37 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -49,7 +49,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -116,7 +116,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index 600b80050fb..6a1a008b345 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -88,7 +88,7 @@ spec: mountPath: /csi - name: csi-nfsplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -120,7 +120,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 2b2f121de93..75bd31c6b0b 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -49,7 +49,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--nodeid=$(NODE_ID)" - "--type=nfs" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 7d60095aae2..4dcb7bf6ccf 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -117,7 +117,7 @@ spec: mountPath: /csi - name: csi-rbdplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -174,7 +174,7 @@ spec: readOnly: true - name: csi-rbdplugin-controller # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--type=controller" - "--v=5" @@ -195,7 +195,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index b5d135cdfdf..d72ba446017 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -51,7 +51,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--nodeid=$(NODE_ID)" - "--pluginpath=/var/lib/kubelet/plugins" @@ -135,7 +135,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.8.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/go.mod b/go.mod index 9120e6f6beb..026d2b83eeb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ceph/ceph-csi -go 1.19 +go 1.20 require ( github.com/IBM/keyprotect-go-client v0.9.2