diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-07-01 02:31:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 02:31:14 +0800 |
| commit | 817cb6738af7a5bec3d3402303158dfb5b035cb9 (patch) | |
| tree | 1ba1f8f89c949416385a8bee956fa3882e2afd32 /hack | |
| parent | Merge pull request #4809 from JiaweiGithub/feat/updateversion (diff) | |
| parent | reconcile rules (diff) | |
| download | kubeedge-817cb6738af7a5bec3d3402303158dfb5b035cb9.tar.gz | |
Merge pull request #4802 from vincentgoat/rbac-offline-sql
authentication and authorization on the edge side
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/generate-crds.sh | 6 | ||||
| -rwxr-xr-x | hack/local-up-kubeedge.sh | 6 | ||||
| -rwxr-xr-x | hack/update-codegen.sh | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/hack/generate-crds.sh b/hack/generate-crds.sh index ce851073c..0fcb0f4ca 100755 --- a/hack/generate-crds.sh +++ b/hack/generate-crds.sh @@ -23,6 +23,7 @@ CRD_OUTPUTS=build/crds DEVICES_VERSION=v1alpha2 OPERATIONS_VERSION=v1alpha1 RELIABLESYNCS_VERSION=v1alpha1 +SERVICEACCOUNTACCESS_VERSION=v1alpha1 APPS_VERSION=v1alpha1 HELM_CRDS_DIR=manifests/charts/cloudcore/crds ROUTER_DIR=build/crds/router @@ -84,6 +85,7 @@ function :copy:to:destination { mkdir -p ${CRD_OUTPUTS}/devices mkdir -p ${CRD_OUTPUTS}/reliablesyncs mkdir -p ${CRD_OUTPUTS}/apps + mkdir -p ${CRD_OUTPUTS}/policy for entry in `ls /tmp/crds/*.yaml`; do CRD_NAME=$(echo ${entry} | cut -d'.' -f3 | cut -d'_' -f2) @@ -96,6 +98,10 @@ function :copy:to:destination { CRD_NAME=$(remove_suffix_s "$CRD_NAME") 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" == "serviceaccountaccesses" ]; then + CRD_NAME="serviceaccountaccess" + cp -v ${entry} ${CRD_OUTPUTS}/policy/policy_${SERVICEACCOUNTACCESS_VERSION}_${CRD_NAME}.yaml + cp -v ${entry} ${HELM_CRDS_DIR}/policy_${SERVICEACCOUNTACCESS_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/local-up-kubeedge.sh b/hack/local-up-kubeedge.sh index e00c3781b..9535621d4 100755 --- a/hack/local-up-kubeedge.sh +++ b/hack/local-up-kubeedge.sh @@ -100,6 +100,11 @@ function create_operation_crd { kubectl apply -f ${KUBEEDGE_ROOT}/build/crds/operations/operations_v1alpha1_nodeupgradejob.yaml } +function create_serviceaccountaccess_crd { + echo "creating the saaccess crd..." + kubectl apply -f ${KUBEEDGE_ROOT}/build/crds/policy/policy_v1alpha1_serviceaccountaccess.yaml +} + function build_cloudcore { echo "building the cloudcore..." make -C "${KUBEEDGE_ROOT}" WHAT="cloudcore" @@ -267,6 +272,7 @@ create_device_crd create_objectsync_crd create_rule_crd create_operation_crd +create_serviceaccountaccess_crd generate_streamserver_cert diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index ec222a0ff..7b534df08 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -36,5 +36,5 @@ export GOPATH="${go_path}" ${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 apps:v1alpha1 operations:v1alpha1" \ +"devices:v1alpha2 reliablesyncs:v1alpha1 rules:v1 apps:v1alpha1 operations:v1alpha1 policy:v1alpha1" \ --go-header-file ${KUBEEDGE_ROOT}/hack/boilerplate/boilerplate.txt |