From 83676175b0533d5f0a4fc2bc765846be7055b4d2 Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Wed, 7 Jun 2017 16:54:12 +0800 Subject: [PATCH] Update hack scripts --- hack/update-generated-runtime-dockerized.sh | 2 +- hack/verify-flags/exceptions.txt | 16 ++++++++-------- hack/verify-generated-runtime.sh | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hack/update-generated-runtime-dockerized.sh b/hack/update-generated-runtime-dockerized.sh index 717ae8758fa..8aaa9bde5fa 100755 --- a/hack/update-generated-runtime-dockerized.sh +++ b/hack/update-generated-runtime-dockerized.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/" +KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/runtime/" source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index 214007fdeb7..633f76759e7 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -124,14 +124,14 @@ hack/test-update-storage-objects.sh: local storage_media_type=${3:-""} hack/test-update-storage-objects.sh: local storage_versions=${2:-""} hack/test-update-storage-objects.sh: source_file=${test_data[0]} hack/test-update-storage-objects.sh:# source_file,resource,namespace,name,old_version,new_version -pkg/kubelet/apis/cri/v1alpha1/api.pb.go: ContainerPort int32 `protobuf:"varint,2,opt,name=container_port,json=containerPort,proto3" json:"container_port,omitempty"` -pkg/kubelet/apis/cri/v1alpha1/api.pb.go: OomScoreAdj int64 `protobuf:"varint,5,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"` -pkg/kubelet/apis/cri/v1alpha1/api.pb.go: PodCidr string `protobuf:"bytes,1,opt,name=pod_cidr,json=podCidr,proto3" json:"pod_cidr,omitempty"` -pkg/kubelet/apis/cri/v1alpha1/api.pb.go: RuntimeConfig *RuntimeConfig `protobuf:"bytes,1,opt,name=runtime_config,json=runtimeConfig" json:"runtime_config,omitempty"` -pkg/kubelet/apis/cri/v1alpha1/api.proto: RuntimeConfig runtime_config = 1; -pkg/kubelet/apis/cri/v1alpha1/api.proto: int32 container_port = 2; -pkg/kubelet/apis/cri/v1alpha1/api.proto: int64 oom_score_adj = 5; -pkg/kubelet/apis/cri/v1alpha1/api.proto: string pod_cidr = 1; +pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go: ContainerPort int32 `protobuf:"varint,2,opt,name=container_port,json=containerPort,proto3" json:"container_port,omitempty"` +pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go: OomScoreAdj int64 `protobuf:"varint,5,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"` +pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go: PodCidr string `protobuf:"bytes,1,opt,name=pod_cidr,json=podCidr,proto3" json:"pod_cidr,omitempty"` +pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go: RuntimeConfig *RuntimeConfig `protobuf:"bytes,1,opt,name=runtime_config,json=runtimeConfig" json:"runtime_config,omitempty"` +pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto: RuntimeConfig runtime_config = 1; +pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto: int32 container_port = 2; +pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto: int64 oom_score_adj = 5; +pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto: string pod_cidr = 1; pkg/kubelet/cm/container_manager_linux.go: glog.V(3).Infof("Failed to apply oom_score_adj %d for pid %d: %v", oomScoreAdj, pid, err) pkg/kubelet/cm/container_manager_linux.go: glog.V(5).Infof("attempting to apply oom_score_adj of %d to pid %d", oomScoreAdj, pid) pkg/kubelet/dockershim/docker_checkpoint.go: ContainerPort *int32 `json:"container_port,omitempty"` diff --git a/hack/verify-generated-runtime.sh b/hack/verify-generated-runtime.sh index 7fa39ac8d0f..f59b0f00d98 100755 --- a/hack/verify-generated-runtime.sh +++ b/hack/verify-generated-runtime.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1" +KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/runtime" source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env