Merge pull request #271 from MrHohn/backend-config-beta

BackendConfig v1alpha1->v1beta1

hack/update-codegen.sh

@@ -27,6 +27,6 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-ge
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
 ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
   k8s.io/ingress-gce/pkg/backendconfig/client k8s.io/ingress-gce/pkg/apis \
-  backendconfig:v1alpha1 \
+  backendconfig:v1beta1 \
   --output-base "$(dirname ${BASH_SOURCE})/../../.." \
   --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt

pkg/apis/backendconfig/v1alpha1/doc.go → pkg/apis/backendconfig/v1beta1/doc.go

@@ -16,6 +16,6 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-// Package v1alpha1 is the v1alpha1 version of the API.
+// Package v1beta1 is the v1beta1 version of the API.
 // +groupName=cloud.google.com
-package v1alpha1
+package v1beta1

pkg/apis/backendconfig/v1alpha1/register.go → pkg/apis/backendconfig/v1beta1/register.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -25,7 +25,7 @@ import (
 )
 
 // SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: backendconfig.GroupName, Version: "v1alpha1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: backendconfig.GroupName, Version: "v1beta1"}
 
 // Kind takes an unqualified kind and returns back a Group qualified GroupKind
 func Kind(kind string) schema.GroupKind {

pkg/apis/backendconfig/v1alpha1/types.go → pkg/apis/backendconfig/v1beta1/types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/backendconfig/backendconfig.go

@@ -27,12 +27,12 @@ import (
 	"k8s.io/client-go/tools/cache"
 
 	"k8s.io/ingress-gce/pkg/annotations"
-	backendconfigv1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1"
+	backendconfigv1beta1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1beta1"
 )
 
 // GetServicesForBackendConfig returns all services that reference the given
 // BackendConfig.
-func GetServicesForBackendConfig(svcLister cache.Store, backendConfig *backendconfigv1alpha1.BackendConfig) []*apiv1.Service {
+func GetServicesForBackendConfig(svcLister cache.Store, backendConfig *backendconfigv1beta1.BackendConfig) []*apiv1.Service {
 	svcs := []*apiv1.Service{}
 	for _, obj := range svcLister.List() {
 		svc := obj.(*apiv1.Service)
@@ -62,7 +62,7 @@ func GetServicesForBackendConfig(svcLister cache.Store, backendConfig *backendco
 
 // GetBackendConfigForServicePort returns the corresponding BackendConfig for
 // the given ServicePort if specified.
-func GetBackendConfigForServicePort(backendConfigLister cache.Store, svc *apiv1.Service, svcPort *apiv1.ServicePort) (*backendconfigv1alpha1.BackendConfig, error) {
+func GetBackendConfigForServicePort(backendConfigLister cache.Store, svc *apiv1.Service, svcPort *apiv1.ServicePort) (*backendconfigv1beta1.BackendConfig, error) {
 	backendConfigNames, err := annotations.FromService(svc).GetBackendConfigs()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get BackendConfig names from service %s/%s: %v", svc.Namespace, svc.Name, err)
@@ -87,7 +87,7 @@ func GetBackendConfigForServicePort(backendConfigLister cache.Store, svc *apiv1.
 	}
 
 	obj, exists, err := backendConfigLister.Get(
-		&backendconfigv1alpha1.BackendConfig{
+		&backendconfigv1beta1.BackendConfig{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      configName,
 				Namespace: svc.Namespace,
@@ -96,5 +96,5 @@ func GetBackendConfigForServicePort(backendConfigLister cache.Store, svc *apiv1.
 	if !exists || err != nil {
 		return nil, fmt.Errorf("failed to get BackendConfig %s for service %s/%s: %v", configName, svc.Namespace, svc.Name, err)
 	}
-	return obj.(*backendconfigv1alpha1.BackendConfig), nil
+	return obj.(*backendconfigv1beta1.BackendConfig), nil
 }

pkg/backendconfig/backendconfig_test.go

@@ -27,11 +27,11 @@ import (
 	"k8s.io/client-go/tools/cache"
 
 	"k8s.io/ingress-gce/pkg/annotations"
-	backendconfigv1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1"
+	backendconfigv1beta1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1beta1"
 )
 
 var (
-	testBackendConfig = &backendconfigv1alpha1.BackendConfig{
+	testBackendConfig = &backendconfigv1beta1.BackendConfig{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "config-test",
 			Namespace: "test",
@@ -266,7 +266,7 @@ func TestGetBackendConfigForServicePort(t *testing.T) {
 		svc            *apiv1.Service
 		svcPort        *apiv1.ServicePort
 		getFunc        func(obj interface{}) (item interface{}, exists bool, err error)
-		expectedConfig *backendconfigv1alpha1.BackendConfig
+		expectedConfig *backendconfigv1beta1.BackendConfig
 		expectErr      bool
 	}{
 		{