Enable deep copy and conversions in OpenShift

cmd/genconversion/conversion.go

@@ -0,0 +1,66 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"runtime"
+	"strings"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	pkg_runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+
+	"github.com/golang/glog"
+	flag "github.com/spf13/pflag"
+
+	_ "github.com/openshift/origin/pkg/api"
+	_ "github.com/openshift/origin/pkg/api/v1"
+	_ "github.com/openshift/origin/pkg/api/v1beta3"
+)
+
+var (
+	functionDest = flag.StringP("funcDest", "f", "-", "Output for conversion functions; '-' means stdout")
+	version      = flag.StringP("version", "v", "v1beta3", "Version for conversion.")
+)
+
+func main() {
+	runtime.GOMAXPROCS(runtime.NumCPU())
+	flag.Parse()
+
+	var funcOut io.Writer
+	if *functionDest == "-" {
+		funcOut = os.Stdout
+	} else {
+		file, err := os.Create(*functionDest)
+		if err != nil {
+			glog.Fatalf("Couldn't open %v: %v", *functionDest, err)
+		}
+		defer file.Close()
+		funcOut = file
+	}
+
+	generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw())
+	apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
+	generator.AssumePrivateConversions()
+	// TODO(wojtek-t): Change the overwrites to a flag.
+	generator.OverwritePackage(*version, "")
+	for _, knownType := range api.Scheme.KnownTypes(*version) {
+		if !strings.Contains(knownType.PkgPath(), "openshift/origin") {
+			continue
+		}
+		if err := generator.GenerateConversionsForType(*version, knownType); err != nil {
+			glog.Errorf("error while generating conversion functions for %v: %v", knownType, err)
+		}
+	}
+	generator.RepackImports(util.NewStringSet("github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"))
+	if err := generator.WriteImports(funcOut); err != nil {
+		glog.Fatalf("error while writing imports: %v", err)
+	}
+	if err := generator.WriteConversionFunctions(funcOut); err != nil {
+		glog.Fatalf("Error while writing conversion functions: %v", err)
+	}
+	if err := generator.RegisterConversionFunctions(funcOut, fmt.Sprintf("%s.Scheme", apiShort)); err != nil {
+		glog.Fatalf("Error while writing conversion functions: %v", err)
+	}
+}

cmd/gendeepcopy/deep_copy.go

@@ -0,0 +1,90 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"runtime"
+	"strings"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	pkg_runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+
+	"github.com/golang/glog"
+	flag "github.com/spf13/pflag"
+
+	_ "github.com/openshift/origin/pkg/api"
+	_ "github.com/openshift/origin/pkg/api/v1"
+	_ "github.com/openshift/origin/pkg/api/v1beta3"
+)
+
+var (
+	functionDest = flag.StringP("func-dest", "f", "-", "Output for deep copy functions; '-' means stdout")
+	version      = flag.StringP("version", "v", "v1beta3", "Version for deep copies.")
+	overwrites   = flag.StringP("overwrites", "o", "", "Comma-separated overwrites for package names")
+)
+
+func main() {
+	runtime.GOMAXPROCS(runtime.NumCPU())
+	flag.Parse()
+
+	var funcOut io.Writer
+	if *functionDest == "-" {
+		funcOut = os.Stdout
+	} else {
+		file, err := os.Create(*functionDest)
+		if err != nil {
+			glog.Fatalf("Couldn't open %v: %v", *functionDest, err)
+		}
+		defer file.Close()
+		funcOut = file
+	}
+
+	knownVersion := *version
+	if knownVersion == "api" {
+		knownVersion = api.Scheme.Raw().InternalVersion
+	}
+	generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), util.NewStringSet("github.com/openshift/origin"))
+	apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
+	generator.ReplaceType("github.com/GoogleCloudPlatform/kubernetes/pkg/util", "empty", struct{}{})
+
+	for _, overwrite := range strings.Split(*overwrites, ",") {
+		vals := strings.Split(overwrite, "=")
+		generator.OverwritePackage(vals[0], vals[1])
+	}
+	for _, knownType := range api.Scheme.KnownTypes(knownVersion) {
+		if !strings.Contains(knownType.PkgPath(), "openshift/origin") {
+			continue
+		}
+		if err := generator.AddType(knownType); err != nil {
+			glog.Errorf("error while generating deep copy functions for %v: %v", knownType, err)
+		}
+	}
+	generator.RepackImports()
+	if err := generator.WriteImports(funcOut); err != nil {
+		glog.Fatalf("error while writing imports: %v", err)
+	}
+	if err := generator.WriteDeepCopyFunctions(funcOut); err != nil {
+		glog.Fatalf("error while writing deep copy functions: %v", err)
+	}
+	if err := generator.RegisterDeepCopyFunctions(funcOut, fmt.Sprintf("%s.Scheme", apiShort)); err != nil {
+		glog.Fatalf("error while registering deep copy functions: %v", err)
+	}
+}

hack/update-generated-conversions.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+function generate_version() {
+	local version=$1
+	local TMPFILE="/tmp/conversion_generated.$(date +%s).go"
+
+	echo "Generating for version ${version}"
+
+	cat >> $TMPFILE <<EOF
+package ${version}
+
+// AUTO-GENERATED FUNCTIONS START HERE
+EOF
+
+	GOPATH=$(godep path):$GOPATH go run cmd/genconversion/conversion.go -v ${version} -f - >>  $TMPFILE
+
+	cat >> $TMPFILE <<EOF
+// AUTO-GENERATED FUNCTIONS END HERE
+EOF
+
+	mv $TMPFILE pkg/api/${version}/conversion_generated.go
+}
+
+VERSIONS="v1beta3 v1"
+for ver in $VERSIONS; do
+	generate_version "${ver}"
+done

hack/update-generated-deep-copies.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+function result_file_name() {
+	local version=$1
+	if [ "${version}" == "api" ]; then
+		echo "pkg/api/deep_copy_generated.go"
+	else
+		echo "pkg/api/${version}/deep_copy_generated.go"
+	fi
+}
+
+function generate_version() {
+	local version=$1
+	local TMPFILE="/tmp/deep_copy_generated.$(date +%s).go"
+
+	echo "Generating for version ${version}"
+
+	cat >> $TMPFILE <<EOF
+package ${version}
+
+// AUTO-GENERATED FUNCTIONS START HERE
+EOF
+
+	GOPATH=$(godep path):$GOPATH go run cmd/gendeepcopy/deep_copy.go -v ${version} -f - -o "${version}=" >>  $TMPFILE
+
+	cat >> $TMPFILE <<EOF
+// AUTO-GENERATED FUNCTIONS END HERE
+EOF
+
+	gofmt -w -s $TMPFILE
+	mv $TMPFILE `result_file_name ${version}`
+}
+
+VERSIONS="api v1beta3 v1"
+# To avoid compile errors, remove the currently existing files.
+for ver in $VERSIONS; do
+	rm -f `result_file_name ${ver}`
+done
+for ver in $VERSIONS; do
+	generate_version "${ver}"
+done

hack/verify-generated-conversions.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+OS_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${OS_ROOT}/hack/common.sh"
+
+cd "${OS_ROOT}"
+"${OS_ROOT}/hack/build-go.sh" cmd/genconversion
+genconversion="${OS_ROOT}/_output/local/go/bin/genconversion"
+
+if [[ ! -x "$genconversion" ]]; then
+  {
+    echo "It looks as if you don't have a compiled conversion binary"
+    echo
+    echo "If you are running from a clone of the git repo, please run"
+    echo "'./hack/build-go.sh cmd/genconversion'."
+  } >&2
+  exit 1
+fi
+
+APIROOT="${OS_ROOT}/pkg/api"
+TMP_APIROOT="${OS_ROOT}/_tmp/api"
+_tmp="${OS_ROOT}/_tmp"
+
+mkdir -p "${_tmp}"
+cp -a "${APIROOT}" "${TMP_APIROOT}"
+
+"${OS_ROOT}/hack/update-generated-conversions.sh"
+echo "diffing ${APIROOT} against freshly generated conversions"
+ret=0
+diff -Naupr -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?
+cp -a ${TMP_APIROOT} "${OS_ROOT}/pkg"
+rm -rf "${_tmp}"
+if [[ $ret -eq 0 ]]
+then
+  echo "${APIROOT} up to date."
+else
+  echo "${APIROOT} is out of date. Please run hack/update-generated-conversions.sh"
+  exit 1
+fi
+
+# ex: ts=2 sw=2 et filetype=sh

hack/verify-generated-deep-copies.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+OS_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${OS_ROOT}/hack/common.sh"
+
+cd "${OS_ROOT}"
+"${OS_ROOT}/hack/build-go.sh" cmd/gendeepcopy
+genconversion="${OS_ROOT}/_output/local/go/bin/gendeepcopy"
+
+if [[ ! -x "$genconversion" ]]; then
+  {
+    echo "It looks as if you don't have a compiled conversion binary"
+    echo
+    echo "If you are running from a clone of the git repo, please run"
+    echo "'./hack/build-go.sh cmd/gendeepcopy'."
+  } >&2
+  exit 1
+fi
+
+APIROOT="${OS_ROOT}/pkg/api"
+TMP_APIROOT="${OS_ROOT}/_tmp/api"
+_tmp="${OS_ROOT}/_tmp"
+
+mkdir -p "${_tmp}"
+cp -a "${APIROOT}" "${TMP_APIROOT}"
+
+"${OS_ROOT}/hack/update-generated-deep-copies.sh"
+echo "diffing ${APIROOT} against freshly generated deep copies"
+ret=0
+diff -Naupr -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?
+cp -a ${TMP_APIROOT} "${OS_ROOT}/pkg"
+rm -rf "${_tmp}"
+if [[ $ret -eq 0 ]]
+then
+  echo "${APIROOT} up to date."
+else
+  echo "${APIROOT} is out of date. Please run hack/update-generated-deep-copies.sh"
+  exit 1
+fi
+
+# ex: ts=2 sw=2 et filetype=sh