Merge pull request #689 from jhadvig/OCPBUGS-2219

OCPBUGS-2219: Empty string should be valid for i18n loadType

Author: openshift-merge-robot

Dockerfile.rhel7

@@ -16,8 +16,8 @@ COPY manifests /manifests/
 COPY quickstarts/*.yaml /manifests/
 
 # extensions manifests generated from openshift/api types
-COPY vendor/github.com/openshift/api/console/v1/*.yaml /manifests/
-COPY vendor/github.com/openshift/api/console/v1alpha1/*.yaml /manifests/
+COPY vendor/github.com/openshift/api/console/v1/*.crd.yaml /manifests/
+COPY vendor/github.com/openshift/api/console/v1alpha1/*.crd.yaml /manifests/
 COPY vendor/github.com/openshift/api/operator/v1/0000_70_console-operator.crd.yaml /manifests/
 COPY vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml /manifests/
 COPY vendor/github.com/openshift/api/helm/v1beta1/0000_10-project-helm-chart-repository.crd.yaml /manifests/

go.mod

@@ -10,9 +10,9 @@ require (
 	github.com/go-test/deep v1.0.5
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
 	github.com/open-cluster-management/api v0.0.0-20210527013639-a6845f2ebcb1
-	github.com/openshift/api v0.0.0-20220930100508-08a31a5d2264
+	github.com/openshift/api v0.0.0-20221018124113-7edcfe3c76cb
 	github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
-	github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e
+	github.com/openshift/client-go v0.0.0-20221019135458-c867144964db
 	github.com/openshift/library-go v0.0.0-20220823205642-e2ef049de560
 	github.com/spf13/cobra v1.4.0
 	gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -410,13 +410,13 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
 github.com/open-cluster-management/api v0.0.0-20210527013639-a6845f2ebcb1 h1:AaFycHD9YOfFXe9C5VsYxKf4LKCXKSLZgK2DnFdHY4M=
 github.com/open-cluster-management/api v0.0.0-20210527013639-a6845f2ebcb1/go.mod h1:ot+A1DWq+v1IV+e1S7nhIteYAmNByFgtazvzpoeAfRQ=
-github.com/openshift/api v0.0.0-20220930100508-08a31a5d2264 h1:XpIdQF9O0gdsQNB60l/AUTMPHZWF2bZUpHQM1Bsrlx4=
-github.com/openshift/api v0.0.0-20220930100508-08a31a5d2264/go.mod h1:HJAEIh4gLXPDdWxgCbvmJjzd9QIxyPZJtPU0u2W4vH4=
+github.com/openshift/api v0.0.0-20221018124113-7edcfe3c76cb h1:QsBjYe5UfHIZi/3SMzQBIjYDKnWqZxq50eQkBp9eUew=
+github.com/openshift/api v0.0.0-20221018124113-7edcfe3c76cb/go.mod h1:JRz+ZvTqu9u7t6suhhPTacbFl5K65Y6rJbNM7HjWA3g=
 github.com/openshift/build-machinery-go v0.0.0-20210115170933-e575b44a7a94/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k=
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
-github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e h1:ab+BJg7h50pi2/rbMkDSXfYx8w80HLmr7NBs8H1hEvU=
-github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e/go.mod h1:e+TTiBDGWB3O3p3iAzl054x3cZDWhrZ5+jxJRCdEFkA=
+github.com/openshift/client-go v0.0.0-20221019135458-c867144964db h1:Vitf4JFANmam4MvZLtM4SpXU16HV9br6UR/QJICZVyM=
+github.com/openshift/client-go v0.0.0-20221019135458-c867144964db/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE=
 github.com/openshift/library-go v0.0.0-20220823205642-e2ef049de560 h1:+A6LeQrrhcn5yKHgBhsGUWbALDxvM4jGhcyyPXehbtw=
 github.com/openshift/library-go v0.0.0-20220823205642-e2ef049de560/go.mod h1:wa3FdYCCqyyQJTKj6Z3YzeujRQmwiydZcEEB+Xd4IWk=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=