Skip to content

Commit

Permalink
Build docker image (#1409)
Browse files Browse the repository at this point in the history
* Build docker image, To #37688693

Signed-off-by: cheyang <[email protected]>

* Build docker image, To #37688693

Signed-off-by: cheyang <[email protected]>
  • Loading branch information
cheyang authored Feb 3, 2022
1 parent 6997fad commit be30015
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 11 deletions.
2 changes: 1 addition & 1 deletion charts/fluid/fluid/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ version: 0.7.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 0.7.0-935578a
appVersion: 0.7.0-6997fad
home: https://github.com/fluid-cloudnative/fluid
keywords:
- category:data
Expand Down
20 changes: 10 additions & 10 deletions charts/fluid/fluid/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ workdir: /tmp

dataset:
controller:
image: fluidcloudnative/dataset-controller:v0.7.0-935578a
image: fluidcloudnative/dataset-controller:v0.7.0-6997fad

csi:
recoverFusePeriod: -1
Expand All @@ -15,7 +15,7 @@ csi:
registrar:
image: registry.aliyuncs.com/acs/csi-node-driver-registrar:v1.2.0
plugins:
image: fluidcloudnative/fluid-csi:v0.7.0-935578a
image: fluidcloudnative/fluid-csi:v0.7.0-6997fad
kubelet:
rootDir: /var/lib/kubelet

Expand All @@ -28,9 +28,9 @@ runtime:
portRange: 20000-26000
enabled: true
init:
image: fluidcloudnative/init-users:v0.7.0-935578a
image: fluidcloudnative/init-users:v0.7.0-6997fad
controller:
image: fluidcloudnative/alluxioruntime-controller:v0.7.0-935578a
image: fluidcloudnative/alluxioruntime-controller:v0.7.0-6997fad
runtime:
image: registry.aliyuncs.com/alluxio/alluxio:release-2.7.2-SNAPSHOT-3714f2b
fuse:
Expand All @@ -44,32 +44,32 @@ runtime:
fuse:
image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:3.8.0
controller:
image: fluidcloudnative/jindoruntime-controller:v0.7.0-935578a
image: fluidcloudnative/jindoruntime-controller:v0.7.0-6997fad
init:
portCheck:
enabled: false
image: fluidcloudnative/init-users:v0.7.0-935578a
image: fluidcloudnative/init-users:v0.7.0-6997fad
goosefs:
runtimeWorkers: 3
portRange: 26000-32000
enabled: false
init:
image: fluidcloudnative/init-users:v0.7.0-935578a
image: fluidcloudnative/init-users:v0.7.0-6997fad
controller:
image: fluidcloudnative/goosefsruntime-controller:v0.7.0-935578a
image: fluidcloudnative/goosefsruntime-controller:v0.7.0-6997fad
runtime:
image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.1.0-kona_jdk11
fuse:
image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.1.0-kona_jdk11
juicefs:
enabled: false
controller:
image: fluidcloudnative/juicefsruntime-controller:v0.7.0-935578a
image: fluidcloudnative/juicefsruntime-controller:v0.7.0-6997fad
fuse:
image: juicedata/juicefs-csi-driver:v0.11.0

webhook:
enabled: true
image: fluidcloudnative/fluid-webhook:v0.7.0-935578a
image: fluidcloudnative/fluid-webhook:v0.7.0-6997fad
replicas: 1

65 changes: 65 additions & 0 deletions pkg/utils/kubeclient/daemonset_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
Copyright 2021 The Fluid Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package kubeclient

import (
"testing"

"github.com/fluid-cloudnative/fluid/pkg/utils/fake"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
)

func TestGetDaemonset(t *testing.T) {
name := "test"
namespace := "default"
ds := &appsv1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
},
Spec: appsv1.DaemonSetSpec{},
Status: appsv1.DaemonSetStatus{
NumberUnavailable: 1,
NumberReady: 1,
},
}

objs := []runtime.Object{}
objs = append(objs, ds.DeepCopy())
s := runtime.NewScheme()
_ = appsv1.AddToScheme(s)
fakeClient := fake.NewFakeClientWithScheme(s, objs...)

_, err := GetDaemonset(fakeClient, name, namespace)
if err != nil {
t.Errorf("failed to call GetDaemonset due to %v with name %s and namespace %s",
err,
name,
namespace)
}

_, err = GetDaemonset(fakeClient, "notFound", namespace)
if err == nil {
t.Errorf("failed to call GetDaemonset due to %v with name %s and namespace %s",
err,
name,
namespace)
}

}

0 comments on commit be30015

Please sign in to comment.