...
 
Commits (10)
package v1
// annotations
const (
// BuildAnnotation is an annotation that identifies a Pod as being for a Build
BuildAnnotation = "openshift.io/build.name"
......@@ -16,11 +17,6 @@ const (
// BuildPodNameAnnotation is an annotation whose value is the name of the pod running this build
BuildPodNameAnnotation = "openshift.io/build.pod-name"
// BuildConfigLabel is the key of a Build label whose value is the ID of a BuildConfig
// on which the Build is based. NOTE: The value for this label may not contain the entire
// BuildConfig name because it will be truncated to maximum label length.
BuildConfigLabel = "openshift.io/build-config.name"
// BuildJenkinsStatusJSONAnnotation is an annotation holding the Jenkins status information
BuildJenkinsStatusJSONAnnotation = "openshift.io/jenkins-status-json"
......@@ -44,7 +40,13 @@ const (
BuildConfigPausedAnnotation = "openshift.io/build-config.paused"
)
// labels
const (
// BuildConfigLabel is the key of a Build label whose value is the ID of a BuildConfig
// on which the Build is based. NOTE: The value for this label may not contain the entire
// BuildConfig name because it will be truncated to maximum label length.
BuildConfigLabel = "openshift.io/build-config.name"
// BuildLabel is the key of a Pod label whose value is the Name of a Build which is run.
// NOTE: The value for this label may not contain the entire Build name because it will be
// truncated to maximum label length.
......@@ -153,3 +155,38 @@ const (
// from its node
StatusReasonBuildPodEvicted StatusReason = "BuildPodEvicted"
)
// env vars
// WhitelistEnvVarNames is a list of special env vars allows s2i containers
var WhitelistEnvVarNames = []string{"BUILD_LOGLEVEL", "GIT_SSL_NO_VERIFY", "HTTP_PROXY", "HTTPS_PROXY", "LANG", "NO_PROXY"}
// env vars
const (
// CustomBuildStrategyBaseImageKey is the environment variable that indicates the base image to be used when
// performing a custom build, if needed.
CustomBuildStrategyBaseImageKey = "OPENSHIFT_CUSTOM_BUILD_BASE_IMAGE"
// AllowedUIDs is an environment variable that contains ranges of UIDs that are allowed in
// Source builder images
AllowedUIDs = "ALLOWED_UIDS"
// DropCapabilities is an environment variable that contains a list of capabilities to drop when
// executing a Source build
DropCapabilities = "DROP_CAPS"
)
// keys inside of secrets and configmaps
const (
// WebHookSecretKey is the key used to identify the value containing the webhook invocation
// secret within a secret referenced by a webhook trigger.
WebHookSecretKey = "WebHookSecretKey"
// RegistryConfKey is the ConfigMap key for the build pod's registry configuration file.
RegistryConfKey = "registries.conf"
// SignaturePolicyKey is the ConfigMap key for the build pod's image signature policy file.
SignaturePolicyKey = "policy.json"
// ServiceCAKey is the ConfigMap key for the service signing certificate authority mounted into build pods.
ServiceCAKey = "service-ca.crt"
)
reviewers:
- benjaminapetersen
- spadgett
package console
import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
consolev1 "github.com/openshift/api/console/v1"
)
const (
GroupName = "console.openshift.io"
)
var (
schemeBuilder = runtime.NewSchemeBuilder(consolev1.Install)
// Install is a function which adds every version of this group to a scheme
Install = schemeBuilder.AddToScheme
)
func Resource(resource string) schema.GroupResource {
return schema.GroupResource{Group: GroupName, Resource: resource}
}
func Kind(kind string) schema.GroupKind {
return schema.GroupKind{Group: GroupName, Kind: kind}
}
// +k8s:deepcopy-gen=package,register
// +k8s:defaulter-gen=TypeMeta
// +k8s:openapi-gen=true
// +groupName=console.openshift.io
// Package v1 is the v1 version of the API.
package v1
package v1
import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
)
var (
GroupName = "console.openshift.io"
GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, corev1.AddToScheme)
// Install is a function which adds this version to a scheme
Install = schemeBuilder.AddToScheme
// SchemeGroupVersion generated code relies on this name
// Deprecated
SchemeGroupVersion = GroupVersion
// AddToScheme exists solely to keep the old generators creating valid code
// DEPRECATED
AddToScheme = schemeBuilder.AddToScheme
)
// Resource generated code relies on this being here, but it logically belongs to the group
// DEPRECATED
func Resource(resource string) schema.GroupResource {
return schema.GroupResource{Group: GroupName, Resource: resource}
}
// addKnownTypes adds types to API group
func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(GroupVersion,
&ConsoleLink{},
&ConsoleCLIDownload{},
&ConsoleNotification{},
)
metav1.AddToGroupVersion(scheme, GroupVersion)
return nil
}
package v1
// Represents a standard link that could be generated in HTML
type Link struct {
// text is the display text for the link
Text string `json:"text"`
// href is the absolute secure URL for the link (must use https)
Href string `json:"href"`
}
package v1
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// +genclient
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// ConsoleCLIDownload is an extension for configuring openshift web console command line interface (CLI) downloads.
type ConsoleCLIDownload struct {
metav1.TypeMeta `json:",inline"`
// Standard object's metadata.
metav1.ObjectMeta `json:"metadata,omitempty"`
Spec ConsoleCLIDownloadSpec `json:"spec"`
}
// ConsoleCLIDownloadSpec is the desired cli download configuration.
type ConsoleCLIDownloadSpec struct {
// displayName is the display name of the CLI download.
DisplayName string `json:"displayName"`
// description is the description of the CLI download (can include markdown).
Description string `json:"description"`
// links is a list of objects that provide CLI download link details.
Links []Link `json:"links"`
}
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type ConsoleCLIDownloadList struct {
metav1.TypeMeta `json:",inline"`
// Standard object's metadata.
metav1.ListMeta `json:"metadata"`
Items []ConsoleCLIDownload `json:"items"`
}
package v1
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// +genclient
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// ConsoleLink is an extension for customizing OpenShift web console links.
type ConsoleLink struct {
metav1.TypeMeta `json:",inline"`
// Standard object's metadata.
metav1.ObjectMeta `json:"metadata,omitempty"`
Spec ConsoleLinkSpec `json:"spec"`
}
// ConsoleLinkSpec is the desired console link configuration.
type ConsoleLinkSpec struct {
Link `json:",inline"`
// location determines which location in the console the link will be appended to.
Location ConsoleLinkLocation `json:"location"`
}
// ConsoleLinkLocationSelector is a set of possible menu targets to which a link may be appended.
type ConsoleLinkLocation string
const (
// HelpMenu indicates that the link should appear in the help menu in the console.
HelpMenu ConsoleLinkLocation = "HelpMenu"
// UserMenu indicates that the link should appear in the user menu in the console.
UserMenu ConsoleLinkLocation = "UserMenu"
)
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type ConsoleLinkList struct {
metav1.TypeMeta `json:",inline"`
// Standard object's metadata.
metav1.ListMeta `json:"metadata"`
Items []ConsoleLink `json:"items"`
}
package v1
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// +genclient
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// ConsoleNotification is the extension for configuring openshift web console notifications.
type ConsoleNotification struct {
metav1.TypeMeta `json:",inline"`
// Standard object's metadata.
metav1.ObjectMeta `json:"metadata,omitempty"`
Spec ConsoleNotificationSpec `json:"spec"`
}
// ConsoleNotificationSpec is the desired console notification configuration.
type ConsoleNotificationSpec struct {
// text is the visible text of the notification.
Text string `json:"text"`
// location is the location of the notification in the console.
// +optional
Location ConsoleNotificationLocation `json:"location,omitempty"`
// link is an object that holds notification link details.
// +optional
Link *Link `json:"link,omitempty"`
// color is the color of the text for the notification as CSS data type color.
// +optional
Color string `json:"color,omitempty"`
// backgroundColor is the color of the background for the notification as CSS data type color.
// +optional
BackgroundColor string `json:"backgroundColor,omitempty"`
}
// ConsoleNotificationLocationSelector is a set of possible notification targets
// to which a notification may be appended.
type ConsoleNotificationLocation string
const (
// BannerTop indicates that the notification should appear at the top of the console.
BannerTop ConsoleNotificationLocation = "BannerTop"
// BannerBottom indicates that the notification should appear at the bottom of the console.
BannerBottom ConsoleNotificationLocation = "BannerBottom"
// BannerTopBottom indicates that the notification should appear both at the top and at the bottom of the console.
BannerTopBottom ConsoleNotificationLocation = "BannerTopBottom"
)
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type ConsoleNotificationList struct {
metav1.TypeMeta `json:",inline"`
// Standard object's metadata.
metav1.ListMeta `json:"metadata"`
Items []ConsoleNotification `json:"items"`
}
// +build !ignore_autogenerated
// Code generated by deepcopy-gen. DO NOT EDIT.
package v1
import (
runtime "k8s.io/apimachinery/pkg/runtime"
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleCLIDownload) DeepCopyInto(out *ConsoleCLIDownload) {
*out = *in
out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
in.Spec.DeepCopyInto(&out.Spec)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleCLIDownload.
func (in *ConsoleCLIDownload) DeepCopy() *ConsoleCLIDownload {
if in == nil {
return nil
}
out := new(ConsoleCLIDownload)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *ConsoleCLIDownload) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleCLIDownloadList) DeepCopyInto(out *ConsoleCLIDownloadList) {
*out = *in
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]ConsoleCLIDownload, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleCLIDownloadList.
func (in *ConsoleCLIDownloadList) DeepCopy() *ConsoleCLIDownloadList {
if in == nil {
return nil
}
out := new(ConsoleCLIDownloadList)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *ConsoleCLIDownloadList) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleCLIDownloadSpec) DeepCopyInto(out *ConsoleCLIDownloadSpec) {
*out = *in
if in.Links != nil {
in, out := &in.Links, &out.Links
*out = make([]Link, len(*in))
copy(*out, *in)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleCLIDownloadSpec.
func (in *ConsoleCLIDownloadSpec) DeepCopy() *ConsoleCLIDownloadSpec {
if in == nil {
return nil
}
out := new(ConsoleCLIDownloadSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleLink) DeepCopyInto(out *ConsoleLink) {
*out = *in
out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
out.Spec = in.Spec
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleLink.
func (in *ConsoleLink) DeepCopy() *ConsoleLink {
if in == nil {
return nil
}
out := new(ConsoleLink)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *ConsoleLink) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleLinkList) DeepCopyInto(out *ConsoleLinkList) {
*out = *in
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]ConsoleLink, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleLinkList.
func (in *ConsoleLinkList) DeepCopy() *ConsoleLinkList {
if in == nil {
return nil
}
out := new(ConsoleLinkList)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *ConsoleLinkList) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleLinkSpec) DeepCopyInto(out *ConsoleLinkSpec) {
*out = *in
out.Link = in.Link
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleLinkSpec.
func (in *ConsoleLinkSpec) DeepCopy() *ConsoleLinkSpec {
if in == nil {
return nil
}
out := new(ConsoleLinkSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleNotification) DeepCopyInto(out *ConsoleNotification) {
*out = *in
out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
in.Spec.DeepCopyInto(&out.Spec)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleNotification.
func (in *ConsoleNotification) DeepCopy() *ConsoleNotification {
if in == nil {
return nil
}
out := new(ConsoleNotification)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *ConsoleNotification) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleNotificationList) DeepCopyInto(out *ConsoleNotificationList) {
*out = *in
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]ConsoleNotification, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleNotificationList.
func (in *ConsoleNotificationList) DeepCopy() *ConsoleNotificationList {
if in == nil {
return nil
}
out := new(ConsoleNotificationList)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *ConsoleNotificationList) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConsoleNotificationSpec) DeepCopyInto(out *ConsoleNotificationSpec) {
*out = *in
if in.Link != nil {
in, out := &in.Link, &out.Link
*out = new(Link)
**out = **in
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleNotificationSpec.
func (in *ConsoleNotificationSpec) DeepCopy() *ConsoleNotificationSpec {
if in == nil {
return nil
}
out := new(ConsoleNotificationSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *Link) DeepCopyInto(out *Link) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Link.
func (in *Link) DeepCopy() *Link {
if in == nil {
return nil
}
out := new(Link)
in.DeepCopyInto(out)
return out
}
package v1
// This file contains a collection of methods that can be used from go-restful to
// generate Swagger API documentation for its models. Please read this PR for more
// information on the implementation: https://github.com/emicklei/go-restful/pull/215
//
// TODOs are ignored from the parser (e.g. TODO(andronat):... || TODO:...) if and only if
// they are on one line! For multiple line or blocks that you want to ignore use ---.
// Any context after a --- is ignored.
//
// Those methods can be generated by using hack/update-swagger-docs.sh
// AUTO-GENERATED FUNCTIONS START HERE
var map_Link = map[string]string{
"": "Represents a standard link that could be generated in HTML",
"text": "text is the display text for the link",
"href": "href is the absolute secure URL for the link (must use https)",
}
func (Link) SwaggerDoc() map[string]string {
return map_Link
}
var map_ConsoleCLIDownload = map[string]string{
"": "ConsoleCLIDownload is an extension for configuring openshift web console command line interface (CLI) downloads.",
"metadata": "Standard object's metadata.",
}
func (ConsoleCLIDownload) SwaggerDoc() map[string]string {
return map_ConsoleCLIDownload
}
var map_ConsoleCLIDownloadList = map[string]string{
"metadata": "Standard object's metadata.",
}
func (ConsoleCLIDownloadList) SwaggerDoc() map[string]string {
return map_ConsoleCLIDownloadList
}
var map_ConsoleCLIDownloadSpec = map[string]string{
"": "ConsoleCLIDownloadSpec is the desired cli download configuration.",
"displayName": "displayName is the display name of the CLI download.",
"description": "description is the description of the CLI download (can include markdown).",
"links": "links is a list of objects that provide CLI download link details.",
}
func (ConsoleCLIDownloadSpec) SwaggerDoc() map[string]string {
return map_ConsoleCLIDownloadSpec
}
var map_ConsoleLink = map[string]string{
"": "ConsoleLink is an extension for customizing OpenShift web console links.",
"metadata": "Standard object's metadata.",
}
func (ConsoleLink) SwaggerDoc() map[string]string {
return map_ConsoleLink
}
var map_ConsoleLinkList = map[string]string{
"metadata": "Standard object's metadata.",
}
func (ConsoleLinkList) SwaggerDoc() map[string]string {
return map_ConsoleLinkList
}
var map_ConsoleLinkSpec = map[string]string{
"": "ConsoleLinkSpec is the desired console link configuration.",
"location": "location determines which location in the console the link will be appended to.",
}
func (ConsoleLinkSpec) SwaggerDoc() map[string]string {
return map_ConsoleLinkSpec
}
var map_ConsoleNotification = map[string]string{
"": "ConsoleNotification is the extension for configuring openshift web console notifications.",
"metadata": "Standard object's metadata.",
}
func (ConsoleNotification) SwaggerDoc() map[string]string {
return map_ConsoleNotification
}
var map_ConsoleNotificationList = map[string]string{
"metadata": "Standard object's metadata.",
}
func (ConsoleNotificationList) SwaggerDoc() map[string]string {
return map_ConsoleNotificationList
}
var map_ConsoleNotificationSpec = map[string]string{
"": "ConsoleNotificationSpec is the desired console notification configuration.",
"text": "text is the visible text of the notification.",
"location": "location is the location of the notification in the console.",
"link": "link is an object that holds notification link details.",
"color": "color is the color of the text for the notification as CSS data type color.",
"backgroundColor": "backgroundColor is the color of the background for the notification as CSS data type color.",
}
func (ConsoleNotificationSpec) SwaggerDoc() map[string]string {
return map_ConsoleNotificationSpec
}
// AUTO-GENERATED FUNCTIONS END HERE
......@@ -13,6 +13,7 @@ API_GROUP_VERSIONS="\
apps/v1 \
authorization/v1 \
build/v1 \
console/v1 \
config/v1 \
image/v1 \
kubecontrolplane/v1 \
......
......@@ -10,6 +10,7 @@ verify="${VERIFY:-}"
${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
github.com/openshift/api/generated \
github.com/openshift/api \
"apps:v1 authorization:v1 build:v1 config:v1 image:v1,docker10,dockerpre012 kubecontrolplane:v1 legacyconfig:v1 network:v1 oauth:v1 openshiftcontrolplane:v1 operator:v1 operator:v1alpha1 osin:v1 project:v1 quota:v1 route:v1 security:v1 servicecertsigner:v1alpha1 template:v1 user:v1 webconsole:v1" \
"apps:v1 authorization:v1 build:v1 config:v1 console:v1 image:v1,docker10,dockerpre012 kubecontrolplane:v1 legacyconfig:v1 network:v1 oauth:v1 openshiftcontrolplane:v1 operator:v1 operator:v1alpha1 osin:v1 project:v1 quota:v1 route:v1 security:v1 servicecertsigner:v1alpha1 template:v1 user:v1 webconsole:v1" \
--go-header-file ${SCRIPT_ROOT}/hack/empty.txt \
${verify}
......@@ -63,4 +63,7 @@ const (
// Limit that applies to image streams. Used with a max[resource] LimitRangeItem to set the maximum number
// of resource. Where the resource is one of "openshift.io/images" and "openshift.io/image-tags".
LimitTypeImageStream corev1.LimitType = "openshift.io/ImageStream"
// The supported type of image signature.
ImageSignatureTypeAtomicImageV1 string = "AtomicImageV1"
)
此差异已折叠。
......@@ -35,6 +35,9 @@ message ClusterNetwork {
// VXLANPort sets the VXLAN destination port used by the cluster. It is set by the master configuration file on startup and cannot be edited manually. Valid values for VXLANPort are integers 1-65535 inclusive and if unset defaults to 4789. Changing VXLANPort allows users to resolve issues between openshift SDN and other software trying to use the same VXLAN destination port.
optional uint32 vxlanPort = 7;
// MTU is the MTU for the overlay network. This should be 50 less than the MTU of the network connecting the nodes. It is normally autodetected by the cluster network operator.
optional uint32 mtu = 8;
}
// ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.
......
......@@ -32,6 +32,8 @@ type ClusterNetwork struct {
ClusterNetworks []ClusterNetworkEntry `json:"clusterNetworks" protobuf:"bytes,6,rep,name=clusterNetworks"`
// VXLANPort sets the VXLAN destination port used by the cluster. It is set by the master configuration file on startup and cannot be edited manually. Valid values for VXLANPort are integers 1-65535 inclusive and if unset defaults to 4789. Changing VXLANPort allows users to resolve issues between openshift SDN and other software trying to use the same VXLAN destination port.
VXLANPort *uint32 `json:"vxlanPort,omitempty" protobuf:"varint,7,opt,name=vxlanPort"`
// MTU is the MTU for the overlay network. This should be 50 less than the MTU of the network connecting the nodes. It is normally autodetected by the cluster network operator.
MTU *uint32 `json:"mtu,omitempty" protobuf:"varint,8,opt,name=mtu"`
}
// ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.
......
......@@ -23,6 +23,11 @@ func (in *ClusterNetwork) DeepCopyInto(out *ClusterNetwork) {
*out = new(uint32)
**out = **in
}
if in.MTU != nil {
in, out := &in.MTU, &out.MTU
*out = new(uint32)
**out = **in
}
return
}
......
......@@ -20,6 +20,7 @@ var map_ClusterNetwork = map[string]string{
"pluginName": "PluginName is the name of the network plugin being used",
"clusterNetworks": "ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from.",
"vxlanPort": "VXLANPort sets the VXLAN destination port used by the cluster. It is set by the master configuration file on startup and cannot be edited manually. Valid values for VXLANPort are integers 1-65535 inclusive and if unset defaults to 4789. Changing VXLANPort allows users to resolve issues between openshift SDN and other software trying to use the same VXLAN destination port.",
"mtu": "MTU is the MTU for the overlay network. This should be 50 less than the MTU of the network connecting the nodes. It is normally autodetected by the cluster network operator.",
}
func (ClusterNetwork) SwaggerDoc() map[string]string {
......
......@@ -7,6 +7,9 @@ import (
// +genclient
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=dnses,scope=Cluster
// +kubebuilder:subresource:status
// DNS manages the CoreDNS component to provide a name resolution service
// for pods and services in the cluster.
......@@ -72,6 +75,7 @@ type DNSStatus struct {
}
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:object:root=true
// DNSList contains a list of DNS
type DNSList struct {
......