Merge pull request #3815 from chrislovecnm/san-api-update

Automatic merge from submit-queue. san api update Missed api update. /assign @geojaz @andrewsykim
kubernetes · Nov 10, 2017 · f86367a · f86367a
2 parents aab07e3 + 6de1828
commit f86367a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 10 deletions.
diff --git a/docs/apireference/build/index.html b/docs/apireference/build/index.html
@@ -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>

diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
@@ -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() {

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
@@ -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() {

diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
@@ -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() {

diff --git a/pkg/client/clientset_generated/clientset/scheme/register.go b/pkg/client/clientset_generated/clientset/scheme/register.go
@@ -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()

diff --git a/pkg/client/clientset_generated/internalclientset/scheme/register.go b/pkg/client/clientset_generated/internalclientset/scheme/register.go
@@ -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()

diff --git a/pkg/openapi/openapi_generated.go b/pkg/openapi/openapi_generated.go
@@ -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)",
@@ -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)",