Merge pull request #98 from christopherhein/chore/93-api-version-serv…

…ice-operator-aws Updated References to service-operator.aws
amazon-archives · Oct 1, 2018 · 057cc00 · 057cc00
2 parents c91eab4 + 1d119ee
commit 057cc00
Show file tree

Hide file tree

Showing 96 changed files with 249 additions and 437 deletions.
diff --git a/cmd/aws-operator/main.go b/cmd/aws-operator/main.go
diff --git a/cmd/aws-operator/server.go b/cmd/aws-operator/server.go
diff --git a/cmd/aws-operator/version.go b/cmd/aws-operator/version.go
diff --git a/code-generation/pkg/codegen/assets/cft.go.templ b/code-generation/pkg/codegen/assets/cft.go.templ
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 )

diff --git a/code-generation/pkg/codegen/assets/controller.go.templ b/code-generation/pkg/codegen/assets/controller.go.templ
@@ -20,9 +20,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	{{- if .Spec.Customizations.Package}}
   "{{.Spec.Customizations.Package}}"
 	{{- end}}
@@ -49,12 +49,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
   topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,

diff --git a/code-generation/pkg/codegen/assets/template_functions.go.templ b/code-generation/pkg/codegen/assets/template_functions.go.templ
@@ -6,7 +6,7 @@
 package helpers
 
 import (
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/code-generation/pkg/codegen/codegen.go b/code-generation/pkg/codegen/codegen.go
@@ -111,7 +111,7 @@ func (c *Codegen) Run() error {
 			models.Items = append(models.Items, parsedModel)
 
 			operatorPath := rootPath + "pkg/operator/" + parsedModel.Spec.Resource.Name
-			apiPath := rootPath + "pkg/apis/operator.aws/v1alpha1"
+			apiPath := rootPath + "pkg/apis/service-operator.aws/v1alpha1"
 
 			createDirIfNotExist(operatorPath)