Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

san api update #3815

Merged
merged 2 commits into from
Nov 10, 2017
Merged

san api update #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61cff4d
updating missed api machinery
chrislovecnm Nov 9, 2017
6de1828
updating api reference docs
chrislovecnm Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/apireference/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ <h3 id="clusterspec-v1alpha2-kops">ClusterSpec v1alpha2 kops</h3>
<td>Additional policies to add for roles</td>
</tr>
<tr>
<td>additionalSans <br /> <em>string array</em></td>
<td>AdditionalSANs adds additional Subject Alternate Names to apiserver cert that kops generates</td>
</tr>
<tr>
<td>api <br /> <em><a href="#accessspec-v1alpha2-kops">AccessSpec</a></em></td>
<td>API field controls how the API is exposed outside the cluster</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,6 @@ func autoConvert_v1alpha1_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
out.Project = in.Project
out.MasterPublicName = in.MasterPublicName
out.MasterInternalName = in.MasterInternalName
out.AdditionalSANs = in.AdditionalSANs
out.NetworkCIDR = in.NetworkCIDR
out.NetworkID = in.NetworkID
if in.Topology != nil {
Expand All @@ -603,6 +602,7 @@ func autoConvert_v1alpha1_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone
out.AdditionalSANs = in.AdditionalSANs
out.ClusterDNSDomain = in.ClusterDNSDomain
// WARNING: in.Multizone requires manual conversion: does not exist in peer-type
out.ServiceClusterIPRange = in.ServiceClusterIPRange
Expand Down Expand Up @@ -822,7 +822,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha1_ClusterSpec(in *kops.ClusterSpec,
out.Project = in.Project
out.MasterPublicName = in.MasterPublicName
out.MasterInternalName = in.MasterInternalName
out.AdditionalSANs = in.AdditionalSANs
out.NetworkCIDR = in.NetworkCIDR
out.NetworkID = in.NetworkID
if in.Topology != nil {
Expand All @@ -838,6 +837,7 @@ func autoConvert_kops_ClusterSpec_To_v1alpha1_ClusterSpec(in *kops.ClusterSpec,
out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone
out.AdditionalSANs = in.AdditionalSANs
out.ClusterDNSDomain = in.ClusterDNSDomain
out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
Expand Down
8 changes: 6 additions & 2 deletions pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ limitations under the License.
package v1alpha1

import (
reflect "reflect"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
)

func init() {
Expand Down Expand Up @@ -759,6 +758,11 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
(*in).DeepCopyInto(*out)
}
}
if in.AdditionalSANs != nil {
in, out := &in.AdditionalSANs, &out.AdditionalSANs
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.Multizone != nil {
in, out := &in.Multizone, &out.Multizone
if *in == nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,6 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
out.Project = in.Project
out.MasterPublicName = in.MasterPublicName
out.MasterInternalName = in.MasterInternalName
out.AdditionalSANs = in.AdditionalSANs
out.NetworkCIDR = in.NetworkCIDR
out.NetworkID = in.NetworkID
if in.Topology != nil {
Expand All @@ -649,6 +648,7 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone
out.AdditionalSANs = in.AdditionalSANs
out.ClusterDNSDomain = in.ClusterDNSDomain
out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
Expand Down Expand Up @@ -884,7 +884,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec,
out.Project = in.Project
out.MasterPublicName = in.MasterPublicName
out.MasterInternalName = in.MasterInternalName
out.AdditionalSANs = in.AdditionalSANs
out.NetworkCIDR = in.NetworkCIDR
out.NetworkID = in.NetworkID
if in.Topology != nil {
Expand All @@ -900,6 +899,7 @@ func autoConvert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec,
out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone
out.AdditionalSANs = in.AdditionalSANs
out.ClusterDNSDomain = in.ClusterDNSDomain
out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
Expand Down
8 changes: 6 additions & 2 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ limitations under the License.
package v1alpha2

import (
reflect "reflect"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
)

func init() {
Expand Down Expand Up @@ -768,6 +767,11 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
(*in).DeepCopyInto(*out)
}
}
if in.AdditionalSANs != nil {
in, out := &in.AdditionalSANs, &out.AdditionalSANs
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.SSHAccess != nil {
in, out := &in.SSHAccess, &out.SSHAccess
*out = make([]string, len(*in))
Expand Down
8 changes: 6 additions & 2 deletions pkg/apis/kops/zz_generated.deepcopy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ limitations under the License.
package kops

import (
reflect "reflect"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
)

func init() {
Expand Down Expand Up @@ -913,6 +912,11 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
(*in).DeepCopyInto(*out)
}
}
if in.AdditionalSANs != nil {
in, out := &in.AdditionalSANs, &out.AdditionalSANs
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.SSHAccess != nil {
in, out := &in.SSHAccess, &out.SSHAccess
*out = make([]string, len(*in))
Expand Down
3 changes: 1 addition & 2 deletions pkg/client/clientset_generated/clientset/scheme/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ limitations under the License.
package scheme

import (
os "os"

announced "k8s.io/apimachinery/pkg/apimachinery/announced"
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
kops "k8s.io/kops/pkg/apis/kops/install"
os "os"
)

var Scheme = runtime.NewScheme()
Expand Down
3 changes: 1 addition & 2 deletions pkg/client/clientset_generated/internalclientset/scheme/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ limitations under the License.
package scheme

import (
os "os"

announced "k8s.io/apimachinery/pkg/apimachinery/announced"
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
kops "k8s.io/kops/pkg/apis/kops/install"
os "os"
)

var Scheme = runtime.NewScheme()
Expand Down
28 changes: 28 additions & 0 deletions pkg/openapi/openapi_generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21374,6 +21374,20 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
Format: "",
},
},
"additionalSans": {
SchemaProps: spec.SchemaProps{
Description: "AdditionalSANs adds additional Subject Alternate Names to apiserver cert that kops generates",
Type: []string{"array"},
Items: &spec.SchemaOrArray{
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
Format: "",
},
},
},
},
},
"clusterDNSDomain": {
SchemaProps: spec.SchemaProps{
Description: "ClusterDNSDomain is the suffix we use for internal DNS names (normally cluster.local)",
Expand Down Expand Up @@ -24588,6 +24602,20 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
Format: "",
},
},
"additionalSans": {
SchemaProps: spec.SchemaProps{
Description: "AdditionalSANs adds additional Subject Alternate Names to apiserver cert that kops generates",
Type: []string{"array"},
Items: &spec.SchemaOrArray{
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
Format: "",
},
},
},
},
},
"clusterDNSDomain": {
SchemaProps: spec.SchemaProps{
Description: "ClusterDNSDomain is the suffix we use for internal DNS names (normally cluster.local)",
Expand Down