Adding updated references to pkg/client and pkg/api

**Why:** * Updated references to new package name **This change addresses the need by:** * closes #93 Signed-off-by: Christopher Hein <me@christopherhein.com>
amazon-archives · Oct 1, 2018 · 1d119ee · 1d119ee
1 parent 119c6cc
commit 1d119ee
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 28 deletions.
diff --git a/codegen.sh b/codegen.sh
@@ -18,4 +18,4 @@ cd ${scriptdir}/vendor/k8s.io/code-generator && ./generate-groups.sh \
   all \
   ${projectdir}/pkg/client \
   ${projectdir}/pkg/apis \
-  "operator.aws:v1alpha1" \
+  "service-operator.aws:v1alpha1" \
diff --git a/configs/aws-service-operator.yaml b/configs/aws-service-operator.yaml
@@ -47,7 +47,7 @@ items:
     - create
     - delete
   - apiGroups:
-    - operator.aws
+    - service-operator.aws
     resources:
     - "*"
     verbs:

diff --git a/examples/cloudformationtemplates/dynamodb.yaml b/examples/cloudformationtemplates/dynamodb.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: dynamodb

diff --git a/examples/cloudformationtemplates/ecrrepository.yaml b/examples/cloudformationtemplates/ecrrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: ecrrepository

diff --git a/examples/cloudformationtemplates/s3bucket.yaml b/examples/cloudformationtemplates/s3bucket.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: s3bucket

diff --git a/examples/cloudformationtemplates/snssubscription.yaml b/examples/cloudformationtemplates/snssubscription.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: snssubscription

diff --git a/examples/cloudformationtemplates/snstopic.yaml b/examples/cloudformationtemplates/snstopic.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: snstopic

diff --git a/examples/cloudformationtemplates/sqsqueue.yaml b/examples/cloudformationtemplates/sqsqueue.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: sqsqueue

diff --git a/examples/dynamodb.yaml b/examples/dynamodb.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: DynamoDB
 metadata:
   name: example-table-name

diff --git a/examples/ecrrepository.yaml b/examples/ecrrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: ECRRepository
 metadata:
   name: example-repository-name
diff --git a/examples/s3bucket.yaml b/examples/s3bucket.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: S3Bucket
 metadata:
   name: Private

diff --git a/examples/snssqssub.yaml b/examples/snssqssub.yaml
@@ -1,11 +1,11 @@
 ---
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SNSTopic
 metadata:
   name: example-sns-topic
 
 ---
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SQSQueue
 metadata:
   name: example-sqs-queue-name
@@ -18,7 +18,7 @@ spec:
   visibilityTimeout: 30
 
 ---
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SNSSubscription
 metadata:
   name: example-subscription-name

diff --git a/examples/snssubscription.yaml b/examples/snssubscription.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SNSSubscription
 metadata:
   name: example-sns-subscription-name

diff --git a/examples/snstopic.yaml b/examples/snstopic.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SNSTopic
 metadata:
   name: example-sns-topic-name

diff --git a/examples/sqsqueue.yaml b/examples/sqsqueue.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SQSQueue
 metadata:
   name: example-sqs-queue-name

diff --git a/pkg/config/types.go b/pkg/config/types.go
@@ -2,7 +2,7 @@ package config
 
 import (
 	"github.com/aws/aws-sdk-go/aws/session"
-	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"
 	opkit "github.com/christopherhein/operator-kit"
 	"github.com/sirupsen/logrus"
 	"k8s.io/client-go/rest"
@@ -13,7 +13,7 @@ type Config struct {
 	Region        string
 	Kubeconfig    string
 	AWSSession    *session.Session
-	AWSClientset  awsclient.OperatorV1alpha1Interface
+	AWSClientset  awsclient.ServiceoperatorV1alpha1Interface
 	RESTConfig    *rest.Config
 	Context       *opkit.Context
 	LoggingConfig *LoggingConfig

diff --git a/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go b/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go
@@ -5,8 +5,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
-	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"
+	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"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"

diff --git a/pkg/helpers/helpers.go b/pkg/helpers/helpers.go
@@ -3,7 +3,7 @@ package helpers
 import (
 	"bytes"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	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"
 	"reflect"

diff --git a/pkg/queue/queue.go b/pkg/queue/queue.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sns"
 	"github.com/aws/aws-sdk-go/service/sqs"
-	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"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 	opkit "github.com/christopherhein/operator-kit"
@@ -71,7 +71,7 @@ func (m *MessageBody) IsComplete() bool {
 }
 
 // New will initialize the Queue object for watching
-func New(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface, timeout int) *Queue {
+func New(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface, timeout int) *Queue {
 	return &Queue{
 		config:       config,
 		context:      context,

diff --git a/pkg/queue/types.go b/pkg/queue/types.go
@@ -1,7 +1,7 @@
 package queue
 
 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"
 	opkit "github.com/christopherhein/operator-kit"
 )
@@ -11,7 +11,7 @@ type Queue struct {
 	config       *config.Config
 	queueURL     string
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	timeout      int64
 }
 

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"time"
 
-	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"
 	"github.com/christopherhein/aws-operator/pkg/operator/cloudformationtemplate"
 	"github.com/christopherhein/aws-operator/pkg/operator/dynamodb"
@@ -115,7 +115,7 @@ func getClientConfig(kubeconfig string) (*rest.Config, error) {
 	return rest.InClusterConfig()
 }
 
-func createContext(kubeconfig string) (*opkit.Context, *rest.Config, awsclient.OperatorV1alpha1Interface, error) {
+func createContext(kubeconfig string) (*opkit.Context, *rest.Config, awsclient.ServiceoperatorV1alpha1Interface, error) {
 	config, err := getClientConfig(kubeconfig)
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("failed to get k8s config. %+v", err)