Merge pull request #2 from sttts/origin-4.5-kubernetes-1.18.0-rc.1-up…

…date-generated-openapi.sh hack: adapt update-generated-openapi.sh to 1.18
openshift · Mar 19, 2020 · d4f131c · d4f131c
2 parents fdfc8c5 + 3f55fdb
commit d4f131c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/hack/update-generated-openapi.sh b/hack/update-generated-openapi.sh
@@ -33,7 +33,10 @@ ORIGIN_INPUT_DIRS=(
   )
 )
 APIEXTENSIONS_INPUT_DIRS=(
+    k8s.io/apiextensions-apiserver
     k8s.io/apimachinery/pkg/apis/meta/v1
+    k8s.io/apimachinery/pkg/runtime
+    k8s.io/apimachinery/pkg/version
     k8s.io/api/autoscaling/v1
 )
 
@@ -50,16 +53,16 @@ ${GOPATH}/bin/openapi-gen \
   --output-base="${GOPATH}/src" \
   --input-dirs $(join , "${KUBE_INPUT_DIRS[@]}") \
   --output-package "${ORIGIN_PREFIX}/vendor/k8s.io/kubernetes/pkg/generated/openapi" \
-  --report-filename "${SCRIPT_ROOT}/vendor/k8s.io/kubernetes/hack/openapi-violation.list" \
+  --report-filename "${SCRIPT_ROOT}/vendor/k8s.io/kubernetes/api/api-rules/violation_exceptions.list" \
   "$@"
 
-echo "Generating apiextensions-apiserver  openapi"
+echo "Generating apiextensions-apiserver openapi"
 ${GOPATH}/bin/openapi-gen \
   --build-tag=ignore_autogenerated_openshift \
   --output-file-base zz_generated.openapi \
   --go-header-file ${SCRIPT_ROOT}/vendor/k8s.io/kubernetes/hack/boilerplate/boilerplate.generatego.txt \
   --output-base="${GOPATH}/src" \
   --input-dirs $(join , "${APIEXTENSIONS_INPUT_DIRS[@]}") \
   --output-package "${ORIGIN_PREFIX}/vendor/k8s.io/apiextensions-apiserver/pkg/generated/openapi" \
-  --report-filename "${SCRIPT_ROOT}/vendor/k8s.io/apiextensions-apiserver/hack/openapi-violation.list" \
+  --report-filename "${SCRIPT_ROOT}/vendor/k8s.io/kubernetes/api/api-rules/apiextensions_violation_exceptions.list" \
   "$@"