diff options
| author | Congrool <chpzhangyifei@qq.com> | 2022-04-05 17:14:20 +0800 |
|---|---|---|
| committer | Congrool <chpzhangyifei@zju.edu.cn> | 2022-05-19 17:08:58 +0800 |
| commit | 60e540a47345585110706ff0c27e1b0ad4f1b9e4 (patch) | |
| tree | 049da8b4dde6fc836c3368b4f1b20e34fec37fcf /hack | |
| parent | init edgeapplication (diff) | |
| download | kubeedge-60e540a47345585110706ff0c27e1b0ad4f1b9e4.tar.gz | |
controller manager fix
Signed-off-by: Congrool <chpzhangyifei@qq.com>
Signed-off-by: Congrool <chpzhangyifei@zju.edu.cn>
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/generate-crds.sh | 8 | ||||
| -rwxr-xr-x | hack/lib/golang.sh | 1 | ||||
| -rwxr-xr-x | hack/make-rules/image.sh | 1 | ||||
| -rwxr-xr-x | hack/update-codegen.sh | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/hack/generate-crds.sh b/hack/generate-crds.sh index ec3534047..8eba11a75 100755 --- a/hack/generate-crds.sh +++ b/hack/generate-crds.sh @@ -22,7 +22,7 @@ CRD_VERSIONS=v1 CRD_OUTPUTS=build/crds DEVICES_VERSION=v1alpha2 RELIABLESYNCS_VERSION=v1alpha1 -GROUPING_VERSION=v1alpha1 +APPS_VERSION=v1alpha1 HELM_CRDS_DIR=manifests/charts/cloudcore/crds ROUTER_DIR=build/crds/router @@ -79,7 +79,7 @@ function :copy:to:destination { # rename files, copy files mkdir -p ${CRD_OUTPUTS}/devices mkdir -p ${CRD_OUTPUTS}/reliablesyncs - mkdir -p ${CRD_OUTPUTS}/grouping + mkdir -p ${CRD_OUTPUTS}/apps for entry in `ls /tmp/crds/*.yaml`; do CRD_NAME=$(echo ${entry} | cut -d'.' -f3 | cut -d'_' -f2) @@ -90,8 +90,8 @@ function :copy:to:destination { cp -v ${entry} ${HELM_CRDS_DIR}/devices_${DEVICES_VERSION}_${CRD_NAME}.yaml elif [ "$CRD_NAME" == "edgeapplications" ] || [ "$CRD_NAME" == "nodegroups" ]; then CRD_NAME=$(remove_suffix_s "$CRD_NAME") - cp -v ${entry} ${CRD_OUTPUTS}/grouping/grouping_${GROUPING_VERSION}_${CRD_NAME}.yaml - cp -v ${entry} ${HELM_CRDS_DIR}/grouping_${GROUPING_VERSION}_${CRD_NAME}.yaml + cp -v ${entry} ${CRD_OUTPUTS}/apps/apps_${APPS_VERSION}_${CRD_NAME}.yaml + cp -v ${entry} ${HELM_CRDS_DIR}/apps_${APPS_VERSION}_${CRD_NAME}.yaml elif [ "$CRD_NAME" == "clusterobjectsyncs" ]; then cp -v ${entry} ${CRD_OUTPUTS}/reliablesyncs/cluster_objectsync_${RELIABLESYNCS_VERSION}.yaml cp -v ${entry} ${HELM_CRDS_DIR}/cluster_objectsync_${RELIABLESYNCS_VERSION}.yaml diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 7d4717050..deda28e7d 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -174,6 +174,7 @@ ALL_BINARIES_AND_TARGETS=( csidriver:cloud/cmd/csidriver iptablesmanager:cloud/cmd/iptablesmanager edgemark:edge/cmd/edgemark + controllermanager:cloud/cmd/controllermanager ) kubeedge::golang::get_target_by_binary() { diff --git a/hack/make-rules/image.sh b/hack/make-rules/image.sh index f93d5c6f3..275a55dbc 100755 --- a/hack/make-rules/image.sh +++ b/hack/make-rules/image.sh @@ -32,6 +32,7 @@ ALL_IMAGES_AND_TARGETS=( csidriver:csidriver:build/csidriver/Dockerfile iptablesmanager:iptables-manager:build/iptablesmanager/Dockerfile edgemark:edgemark:build/edgemark/Dockerfile + controllermanager:controller-manager:build/controllermanager/Dockerfile installation-package:installation-package:build/docker/installation-package/installation-package.dockerfile ) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 0541515b5..f8d485c7e 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -24,5 +24,5 @@ export GOPATH="${GOPATH:-$(go env GOPATH)}" ${KUBEEDGE_ROOT}/hack/generate-groups.sh "deepcopy,client,informer,lister" \ github.com/kubeedge/kubeedge/pkg/client github.com/kubeedge/kubeedge/pkg/apis \ -"devices:v1alpha2 reliablesyncs:v1alpha1 rules:v1 grouping:v1alpha1" \ +"devices:v1alpha2 reliablesyncs:v1alpha1 rules:v1 apps:v1alpha1" \ --go-header-file ${KUBEEDGE_ROOT}/hack/boilerplate/boilerplate.txt |