Skip to content

Commit 1ef0b78

Browse files
committed
do not push cache runtime controller image as it is not ready
Signed-off-by: xliuqq <xlzq1992@gmail.com>
1 parent 3f52cde commit 1ef0b78

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ DOCKER_PUSH += docker-push-webhook
125125
DOCKER_PUSH += docker-push-goosefsruntime-controller
126126
DOCKER_PUSH += docker-push-juicefsruntime-controller
127127
DOCKER_PUSH += docker-push-thinruntime-controller
128-
DOCKER_PUSH += docker-push-cacheruntime-controller
128+
#DOCKER_PUSH += docker-push-cacheruntime-controller
129129
DOCKER_PUSH += docker-push-efcruntime-controller
130130
DOCKER_PUSH += docker-push-vineyardruntime-controller
131131
# Not need to push init-users image by default
@@ -143,7 +143,7 @@ DOCKER_BUILDX_PUSH += docker-buildx-push-csi
143143
DOCKER_BUILDX_PUSH += docker-buildx-push-webhook
144144
DOCKER_BUILDX_PUSH += docker-buildx-push-juicefsruntime-controller
145145
DOCKER_BUILDX_PUSH += docker-buildx-push-thinruntime-controller
146-
DOCKER_BUILDX_PUSH += docker-buildx-push-cacheruntime-controller
146+
#DOCKER_BUILDX_PUSH += docker-buildx-push-cacheruntime-controller
147147
DOCKER_BUILDX_PUSH += docker-buildx-push-efcruntime-controller
148148
DOCKER_BUILDX_PUSH += docker-buildx-push-vineyardruntime-controller
149149
# Not need to push init-users image by default

charts/fluid/fluid/templates/role/cache/rbac.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ rules:
143143
apiVersion: rbac.authorization.k8s.io/v1
144144
kind: Role
145145
metadata:
146-
namespace: fluid-system
146+
namespace: {{ include "fluid.namespace" . }}
147147
name: cacheruntime-controller
148148
rules:
149149
- apiGroups:
@@ -177,24 +177,24 @@ roleRef:
177177
subjects:
178178
- kind: ServiceAccount
179179
name: cacheruntime-controller
180-
namespace: fluid-system
180+
namespace: {{ include "fluid.namespace" . }}
181181
---
182182
apiVersion: rbac.authorization.k8s.io/v1
183183
kind: RoleBinding
184184
metadata:
185185
name: cacheruntime-rolebinding
186-
namespace: fluid-system
186+
namespace: {{ include "fluid.namespace" . }}
187187
roleRef:
188188
apiGroup: rbac.authorization.k8s.io
189189
kind: Role
190190
name: cacheruntime-controller
191191
subjects:
192192
- kind: ServiceAccount
193193
name: cacheruntime-controller
194-
namespace: fluid-system
194+
namespace: {{ include "fluid.namespace" . }}
195195
---
196196
apiVersion: v1
197197
kind: ServiceAccount
198198
metadata:
199199
name: cacheruntime-controller
200-
namespace: fluid-system
200+
namespace: {{ include "fluid.namespace" . }}

docker/Dockerfile.cacheruntime

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/f
2323
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2424
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2525
chmod u+x /usr/local/bin/ddc-helm && \
26-
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz
26+
rm -f helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
27+
rm -rf linux-${TARGETARCH}
2728

2829
COPY --from=builder /go/src/github.com/fluid-cloudnative/fluid/charts/ /charts
2930

pkg/ddc/cache/engine/dataset.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,10 @@ func (e *CacheEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err
8080
// TODO(cache runtime): update datasetToUpdate.Status.CacheStates
8181

8282
if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) {
83+
e.Log.Info("the dataset status", "status", datasetToUpdate.Status)
8384
err = e.Client.Status().Update(context.TODO(), datasetToUpdate)
8485
if err != nil {
8586
return err
86-
} else {
87-
e.Log.Info("No need to update the cache of the data")
8887
}
8988
}
9089

pkg/ddc/cache/engine/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (e *CacheEngine) CheckAndUpdateRuntimeStatus(value *common.CacheRuntimeValu
6565
}
6666

6767
if value.Client.Enabled {
68-
err = e.setClientComponentStatus(&runtimeToUpdate.Status.Worker)
68+
err = e.setClientComponentStatus(&runtimeToUpdate.Status.Client)
6969
if err != nil {
7070
return err
7171
}

0 commit comments

Comments
 (0)