Add SslPolicy Field to FrontendConfig

This is an optional field
kubernetes · Feb 10, 2020 · 372ad0c · 372ad0c
1 parent 658bdc1
commit 372ad0c
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 36 deletions.
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -20,7 +20,7 @@ set -o pipefail
 
 SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
 CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
-OPENAPI_PKG=${GOPATH}/src/k8s.io/kube-openapi
+OPENAPI_PKG=k8s.io/kube-openapi
 
 echo "Generating composite types"
 go run ${SCRIPT_ROOT}/pkg/composite/gen/main.go
@@ -52,7 +52,7 @@ echo "Performing code generation for FrontendConfig CRD"
 ${CODEGEN_PKG}/generate-groups.sh \
   "deepcopy,client,informer,lister" \
   k8s.io/ingress-gce/pkg/frontendconfig/client k8s.io/ingress-gce/pkg/apis \
-  frontendconfig:v1beta1 \
+  "frontendconfig:v1beta1" \
   --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
 
 echo "Generating openapi for FrontendConfig v1beta1"

diff --git a/pkg/apis/frontendconfig/v1beta1/types.go b/pkg/apis/frontendconfig/v1beta1/types.go
@@ -28,15 +28,14 @@ import (
 type FrontendConfig struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   FrontendConfigSpec   `json:"spec"`
-	Status FrontendConfigStatus `json:"status"`
+	Spec              FrontendConfigSpec   `json:"spec"`
+	Status            FrontendConfigStatus `json:"status"`
 }
 
 // FrontendConfigSpec is the spec for a FrontendConfig resource
 // +k8s:openapi-gen=true
 type FrontendConfigSpec struct {
-	// Add individual features here
+	SslPolicy *string `json:"sslPolicy,omitempty"`
 }
 
 // FrontendConfigStatus is the status for a FrontendConfig resource

diff --git a/pkg/apis/frontendconfig/v1beta1/zz_generated.deepcopy.go b/pkg/apis/frontendconfig/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/apis/frontendconfig/v1beta1/zz_generated.openapi.go b/pkg/apis/frontendconfig/v1beta1/zz_generated.openapi.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/clientset.go b/pkg/frontendconfig/client/clientset/versioned/clientset.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/doc.go b/pkg/frontendconfig/client/clientset/versioned/doc.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/fake/clientset_generated.go b/pkg/frontendconfig/client/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/fake/doc.go b/pkg/frontendconfig/client/clientset/versioned/fake/doc.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/fake/register.go b/pkg/frontendconfig/client/clientset/versioned/fake/register.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/scheme/doc.go b/pkg/frontendconfig/client/clientset/versioned/scheme/doc.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/scheme/register.go b/pkg/frontendconfig/client/clientset/versioned/scheme/register.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/doc.go b/pkg/frontendconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/doc.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/fake/doc.go b/pkg/frontendconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/fake/doc.go
diff --git a/...onfig/client/clientset/versioned/typed/frontendconfig/v1beta1/fake/fake_frontendconfig.go b/...onfig/client/clientset/versioned/typed/frontendconfig/v1beta1/fake/fake_frontendconfig.go
diff --git a/...lient/clientset/versioned/typed/frontendconfig/v1beta1/fake/fake_frontendconfig_client.go b/...lient/clientset/versioned/typed/frontendconfig/v1beta1/fake/fake_frontendconfig_client.go
diff --git a/pkg/frontendconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/frontendconfig.go b/pkg/frontendconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/frontendconfig.go
diff --git a/...ndconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/frontendconfig_client.go b/...ndconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/frontendconfig_client.go
diff --git a/...tendconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/generated_expansion.go b/...tendconfig/client/clientset/versioned/typed/frontendconfig/v1beta1/generated_expansion.go
diff --git a/pkg/frontendconfig/client/informers/externalversions/factory.go b/pkg/frontendconfig/client/informers/externalversions/factory.go
diff --git a/pkg/frontendconfig/client/informers/externalversions/frontendconfig/interface.go b/pkg/frontendconfig/client/informers/externalversions/frontendconfig/interface.go
diff --git a/...frontendconfig/client/informers/externalversions/frontendconfig/v1beta1/frontendconfig.go b/...frontendconfig/client/informers/externalversions/frontendconfig/v1beta1/frontendconfig.go
diff --git a/pkg/frontendconfig/client/informers/externalversions/frontendconfig/v1beta1/interface.go b/pkg/frontendconfig/client/informers/externalversions/frontendconfig/v1beta1/interface.go
diff --git a/pkg/frontendconfig/client/informers/externalversions/generic.go b/pkg/frontendconfig/client/informers/externalversions/generic.go
diff --git a/...frontendconfig/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/...frontendconfig/client/informers/externalversions/internalinterfaces/factory_interfaces.go
diff --git a/pkg/frontendconfig/client/listers/frontendconfig/v1beta1/expansion_generated.go b/pkg/frontendconfig/client/listers/frontendconfig/v1beta1/expansion_generated.go
diff --git a/pkg/frontendconfig/client/listers/frontendconfig/v1beta1/frontendconfig.go b/pkg/frontendconfig/client/listers/frontendconfig/v1beta1/frontendconfig.go