Skip to content

Commit

Permalink
revert: revert commits to build v3.9.0 tags
Browse files Browse the repository at this point in the history
This commit reverts a couple of changes from
release v3.9 branch.
Since template changes were not done pointing
image tag to 3.9-canary, v3.9.0 images were
overwritten.
This revert is done in order to restore
v3.9.0 tagged image.

Signed-off-by: Rakshith R <rar@redhat.com>
  • Loading branch information
Rakshith-R committed Jul 6, 2023
1 parent c6db73f commit e3b8cb4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 18 deletions.
10 changes: 5 additions & 5 deletions deploy/cephcsi/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ ARG BASE_IMAGE

FROM ${BASE_IMAGE} as updated_base

# 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,ceph-iscsi || true

RUN dnf -y update \
&& dnf clean all \
&& rm -rf /var/cache/yum
Expand All @@ -34,6 +29,11 @@ RUN source /build.env && \
# 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 \
Expand Down
8 changes: 0 additions & 8 deletions internal/rbd/nodeserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -512,14 +512,6 @@ func resizeNodeStagePath(ctx context.Context,
if err != nil {
return status.Error(codes.Internal, err.Error())
}

// If this is a AccessType=Block volume, do not attempt
// filesystem resize. The application is in charge of the data
// on top of the raw block-device, we can not assume there is a
// filesystem at all.
if isBlock {
return nil
}
}
// check stagingPath needs resize.
ok, err = resizer.NeedResize(devicePath, stagingTargetPath)
Expand Down
5 changes: 0 additions & 5 deletions scripts/Dockerfile.devel
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ RUN source /build.env \
&& mkdir -p /usr/local/go \
&& curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz | tar xzf - -C ${GOROOT} --strip-components=1

# 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,ceph-iscsi || true

RUN dnf -y install \
git \
make \
Expand Down

0 comments on commit e3b8cb4

Please sign in to comment.