From 1a1d37ef47d3ce346eba4d9bb906e71b81fbb876 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Thu, 8 Aug 2019 16:30:17 -0400 Subject: [PATCH 1/2] Bug 1732144: Fix description of cluster build config --- config/v1/types_build.go | 9 ++++++++- config/v1/zz_generated.swagger_doc_generated.go | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/v1/types_build.go b/config/v1/types_build.go index c7ed7e958b1..fa4088ca7e7 100644 --- a/config/v1/types_build.go +++ b/config/v1/types_build.go @@ -9,7 +9,10 @@ import ( // +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// Build holds cluster-wide information on how to handle builds. The canonical name is `cluster` +// Build configures the behavior of OpenShift builds for the entire cluster. +// This includes default settings that can be overridden in BuildConfig objects, and overrides which are applied to all builds. +// +// The canonical name is "cluster" type Build struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -23,6 +26,10 @@ type BuildSpec struct { // AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that // should be trusted for image pushes and pulls during builds. // The namespace for this config map is openshift-config. + // + // DEPRECATED: Additional CAs for image pull and push should be set on + // image.config.openshift.io/cluster instead. + // // +optional AdditionalTrustedCA ConfigMapNameReference `json:"additionalTrustedCA"` // BuildDefaults controls the default information for Builds diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go index 1a5d587a15a..0207d6d6068 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -326,7 +326,7 @@ func (WebhookTokenAuthenticator) SwaggerDoc() map[string]string { } var map_Build = map[string]string{ - "": "Build holds cluster-wide information on how to handle builds. The canonical name is `cluster`", + "": "Build configures the behavior of OpenShift builds for the entire cluster. This includes default settings that can be overridden in BuildConfig objects, and overrides which are applied to all builds.\n\nThe canonical name is \"cluster\"", "spec": "Spec holds user-settable values for the build controller configuration", } @@ -365,7 +365,7 @@ func (BuildOverrides) SwaggerDoc() map[string]string { } var map_BuildSpec = map[string]string{ - "additionalTrustedCA": "AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted for image pushes and pulls during builds. The namespace for this config map is openshift-config.", + "additionalTrustedCA": "AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted for image pushes and pulls during builds. The namespace for this config map is openshift-config.\n\nDEPRECATED: Additional CAs for image pull and push should be set on image.config.openshift.io/cluster instead.", "buildDefaults": "BuildDefaults controls the default information for Builds", "buildOverrides": "BuildOverrides controls override settings for builds", } From 61ed969569ad595b457f9d66a25a30a1fa0ad70a Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Tue, 20 Aug 2019 12:33:11 -0400 Subject: [PATCH 2/2] Fix generated protobuf --- apps/v1/generated.pb.go | 26 ++++++++++++++++---------- authorization/v1/generated.pb.go | 25 ++++++++++++++++--------- build/v1/generated.pb.go | 26 ++++++++++++++++---------- image/v1/generated.pb.go | 24 +++++++++++++++--------- network/v1/generated.pb.go | 17 +++++++++++------ oauth/v1/generated.pb.go | 17 +++++++++++------ project/v1/generated.pb.go | 19 ++++++++++++------- quota/v1/generated.pb.go | 21 +++++++++++++-------- route/v1/generated.pb.go | 21 +++++++++++++-------- security/v1/generated.pb.go | 19 ++++++++++++------- template/v1/generated.pb.go | 23 ++++++++++++++--------- user/v1/generated.pb.go | 19 ++++++++++++------- 12 files changed, 161 insertions(+), 96 deletions(-) diff --git a/apps/v1/generated.pb.go b/apps/v1/generated.pb.go index ae308009352..fd7e79fa05f 100644 --- a/apps/v1/generated.pb.go +++ b/apps/v1/generated.pb.go @@ -34,21 +34,27 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_api_core_v1 "k8s.io/api/core/v1" -import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + proto "github.com/gogo/protobuf/proto" -import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr" + math "math" -import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + k8s_io_api_core_v1 "k8s.io/api/core/v1" -import strings "strings" -import reflect "reflect" + k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -import io "io" + k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr" + + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/authorization/v1/generated.pb.go b/authorization/v1/generated.pb.go index c8e008826a0..245fffeafba 100644 --- a/authorization/v1/generated.pb.go +++ b/authorization/v1/generated.pb.go @@ -46,18 +46,25 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_api_core_v1 "k8s.io/api/core/v1" -import k8s_io_api_rbac_v1 "k8s.io/api/rbac/v1" -import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + proto "github.com/gogo/protobuf/proto" -import strings "strings" -import reflect "reflect" + math "math" -import io "io" + k8s_io_api_core_v1 "k8s.io/api/core/v1" + + k8s_io_api_rbac_v1 "k8s.io/api/rbac/v1" + + k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/build/v1/generated.pb.go b/build/v1/generated.pb.go index bcec53e1342..83221ca919b 100644 --- a/build/v1/generated.pb.go +++ b/build/v1/generated.pb.go @@ -65,21 +65,27 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_api_core_v1 "k8s.io/api/core/v1" -import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + proto "github.com/gogo/protobuf/proto" -import time "time" + math "math" -import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + k8s_io_api_core_v1 "k8s.io/api/core/v1" -import strings "strings" -import reflect "reflect" + k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -import io "io" + time "time" + + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/image/v1/generated.pb.go b/image/v1/generated.pb.go index ae113b7d359..f985843fd3b 100644 --- a/image/v1/generated.pb.go +++ b/image/v1/generated.pb.go @@ -45,19 +45,25 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_api_core_v1 "k8s.io/api/core/v1" -import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + proto "github.com/gogo/protobuf/proto" -import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + math "math" -import strings "strings" -import reflect "reflect" + k8s_io_api_core_v1 "k8s.io/api/core/v1" -import io "io" + k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/network/v1/generated.pb.go b/network/v1/generated.pb.go index 9264f76646d..34a5dabb95c 100644 --- a/network/v1/generated.pb.go +++ b/network/v1/generated.pb.go @@ -23,14 +23,19 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import strings "strings" -import reflect "reflect" + proto "github.com/gogo/protobuf/proto" -import io "io" + math "math" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/oauth/v1/generated.pb.go b/oauth/v1/generated.pb.go index 0a4f507f125..13ce3d91118 100644 --- a/oauth/v1/generated.pb.go +++ b/oauth/v1/generated.pb.go @@ -23,14 +23,19 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import strings "strings" -import reflect "reflect" + proto "github.com/gogo/protobuf/proto" -import io "io" + math "math" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/project/v1/generated.pb.go b/project/v1/generated.pb.go index 018c6acd1f5..7124798120b 100644 --- a/project/v1/generated.pb.go +++ b/project/v1/generated.pb.go @@ -16,16 +16,21 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_api_core_v1 "k8s.io/api/core/v1" + proto "github.com/gogo/protobuf/proto" -import strings "strings" -import reflect "reflect" + math "math" -import io "io" + k8s_io_api_core_v1 "k8s.io/api/core/v1" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/quota/v1/generated.pb.go b/quota/v1/generated.pb.go index 94ff472379e..3c6dedc78e6 100644 --- a/quota/v1/generated.pb.go +++ b/quota/v1/generated.pb.go @@ -19,18 +19,23 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + proto "github.com/gogo/protobuf/proto" -import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + math "math" -import strings "strings" -import reflect "reflect" + k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -import io "io" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/route/v1/generated.pb.go b/route/v1/generated.pb.go index dde33a99432..6210b9ff7c8 100644 --- a/route/v1/generated.pb.go +++ b/route/v1/generated.pb.go @@ -21,18 +21,23 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + proto "github.com/gogo/protobuf/proto" -import k8s_io_api_core_v1 "k8s.io/api/core/v1" + math "math" -import strings "strings" -import reflect "reflect" + k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -import io "io" + k8s_io_api_core_v1 "k8s.io/api/core/v1" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/security/v1/generated.pb.go b/security/v1/generated.pb.go index 02fbad99bed..4d73de07510 100644 --- a/security/v1/generated.pb.go +++ b/security/v1/generated.pb.go @@ -30,16 +30,21 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_api_core_v1 "k8s.io/api/core/v1" + proto "github.com/gogo/protobuf/proto" -import strings "strings" -import reflect "reflect" + math "math" -import io "io" + k8s_io_api_core_v1 "k8s.io/api/core/v1" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/template/v1/generated.pb.go b/template/v1/generated.pb.go index 1de3d14173d..a497b86e20b 100644 --- a/template/v1/generated.pb.go +++ b/template/v1/generated.pb.go @@ -25,20 +25,25 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import k8s_io_api_core_v1 "k8s.io/api/core/v1" + proto "github.com/gogo/protobuf/proto" -import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime" + math "math" -import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + k8s_io_api_core_v1 "k8s.io/api/core/v1" -import strings "strings" -import reflect "reflect" + k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime" -import io "io" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/user/v1/generated.pb.go b/user/v1/generated.pb.go index 172e4a7cb7c..796f4755358 100644 --- a/user/v1/generated.pb.go +++ b/user/v1/generated.pb.go @@ -19,16 +19,21 @@ */ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + proto "github.com/gogo/protobuf/proto" -import strings "strings" -import reflect "reflect" + math "math" -import io "io" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + + strings "strings" + + reflect "reflect" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal