Merge ee4270c into 2c39d42

Makefile

@@ -5,7 +5,7 @@ VERSION       ?= $(shell git describe --tags --always --dirty)
 IMAGE         ?= mikkeloscar/$(BINARY)
 TAG           ?= $(VERSION)
 SOURCES       = $(shell find . -name '*.go')
-GENERATED     = pkg/client pkg/apis/amazonaws.com/v1/zz_generated.deepcopy.go
+GENERATED     = pkg/client pkg/apis/zalando.org/v1/zz_generated.deepcopy.go
 DOCKERFILE    ?= Dockerfile
 GOPKGS        = $(shell go list ./...)
 BUILD_FLAGS   ?= -v

README.md

@@ -77,7 +77,7 @@ applications in a namespace you need to define an `AWSIAMRole` resource which
 references the IAM role you want:
 
 ```yaml
-apiVersion: amazonaws.com/v1
+apiVersion: zalando.org/v1
 kind: AWSIAMRole
 metadata:
   name: my-app-iam-role

awsiamrole_controller.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	av1 "github.com/mikkeloscar/kube-aws-iam-controller/pkg/apis/amazonaws.com/v1"
+	av1 "github.com/mikkeloscar/kube-aws-iam-controller/pkg/apis/zalando.org/v1"
 	"github.com/mikkeloscar/kube-aws-iam-controller/pkg/clientset"
 	"github.com/mikkeloscar/kube-aws-iam-controller/pkg/recorder"
 	log "github.com/sirupsen/logrus"
@@ -120,7 +120,7 @@ func (c *AWSIAMRoleController) refresh() error {
 		return err
 	}
 
-	awsIAMRoles, err := c.client.AmazonawsV1().AWSIAMRoles(c.namespace).List(metav1.ListOptions{})
+	awsIAMRoles, err := c.client.ZalandoV1().AWSIAMRoles(c.namespace).List(metav1.ListOptions{})
 	if err != nil {
 		return err
 	}
@@ -210,7 +210,7 @@ func (c *AWSIAMRoleController) refresh() error {
 				Expiration:         &expiryTime,
 			}
 
-			_, err = c.client.AmazonawsV1().AWSIAMRoles(awsIAMRole.Namespace).UpdateStatus(&awsIAMRole)
+			_, err = c.client.ZalandoV1().AWSIAMRoles(awsIAMRole.Namespace).UpdateStatus(&awsIAMRole)
 			if err != nil {
 				log.Errorf("Failed to update status for AWSIAMRole %s/%s: %v", awsIAMRole.Namespace, awsIAMRole.Name, err)
 				continue
@@ -323,7 +323,7 @@ func (c *AWSIAMRoleController) refresh() error {
 				}
 
 				// update AWSIAMRole status
-				_, err = c.client.AmazonawsV1().AWSIAMRoles(awsIAMRole.Namespace).UpdateStatus(&awsIAMRole)
+				_, err = c.client.ZalandoV1().AWSIAMRoles(awsIAMRole.Namespace).UpdateStatus(&awsIAMRole)
 				if err != nil {
 					log.Errorf("Failed to update status of AWSIAMRole %s/%s: %v", awsIAMRole.Namespace, awsIAMRole.Name, err)
 					continue
@@ -393,7 +393,7 @@ func (c *AWSIAMRoleController) refresh() error {
 			Expiration:         &expiryTime,
 		}
 
-		_, err = c.client.AmazonawsV1().AWSIAMRoles(awsIAMRole.Namespace).UpdateStatus(&awsIAMRole)
+		_, err = c.client.ZalandoV1().AWSIAMRoles(awsIAMRole.Namespace).UpdateStatus(&awsIAMRole)
 		if err != nil {
 			log.Errorf("Failed to update status of AWSIAMRole %s/%s: %v", awsIAMRole.Namespace, awsIAMRole.Name, err)
 			continue

awsiamrole_controller_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	av1 "github.com/mikkeloscar/kube-aws-iam-controller/pkg/apis/amazonaws.com/v1"
+	av1 "github.com/mikkeloscar/kube-aws-iam-controller/pkg/apis/zalando.org/v1"
 	fakeAWS "github.com/mikkeloscar/kube-aws-iam-controller/pkg/client/clientset/versioned/fake"
 	"github.com/mikkeloscar/kube-aws-iam-controller/pkg/clientset"
 	"github.com/stretchr/testify/require"
@@ -17,7 +17,7 @@ import (
 func TestIsOwnedReference(t *testing.T) {
 	owner := av1.AWSIAMRole{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: "amazonaws.com/v1",
+			APIVersion: "zalando.org/v1",
 			Kind:       "AWSIAMRole",
 		},
 		ObjectMeta: metav1.ObjectMeta{
@@ -152,7 +152,7 @@ func TestRefreshAWSIAMRole(tt *testing.T) {
 			client := clientset.NewClientset(kubeClient, awsKubeClient)
 
 			for _, role := range tc.awsIAMRoles {
-				_, err := client.AmazonawsV1().AWSIAMRoles("default").Create(&role)
+				_, err := client.ZalandoV1().AWSIAMRoles("default").Create(&role)
 				require.NoError(t, err)
 			}
 

docs/aws_iam_role_crd.yaml

@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: awsiamroles.amazonaws.com
+  name: awsiamroles.zalando.org
 spec:
-  group: amazonaws.com
+  group: zalando.org
   version: v1
   scope: Namespaced
   names:

docs/deployment_with_role.yaml

@@ -41,7 +41,7 @@ spec:
         secret:
           secretName: kube-aws-iam-controller-iam-role # name of the AWSIAMRole resource
 ---
-apiVersion: amazonaws.com/v1
+apiVersion: zalando.org/v1
 kind: AWSIAMRole
 metadata:
   name: kube-aws-iam-controller-iam-role

docs/example-app.yaml

@@ -47,7 +47,7 @@ spec:
         secret:
           secretName: my-app-iam-role # name of the AWSIAMRole resource
 ---
-apiVersion: amazonaws.com/v1
+apiVersion: zalando.org/v1
 kind: AWSIAMRole
 metadata:
   name: my-app-iam-role

docs/rbac.yaml

@@ -10,7 +10,7 @@ metadata:
   name: kube-aws-iam-controller
 rules:
 - apiGroups:
-  - "amazonaws.com"
+  - "zalando.org"
   resources:
   - awsiamroles
   - awsiamroles/status

docs/sdk-configuration.md

@@ -55,7 +55,7 @@ spec:
         secret:
           secretName: aws-iam-java-example # name of the AWSIAMRole resource
 ---
-apiVersion: amazonaws.com/v1
+apiVersion: zalando.org/v1
 kind: AWSIAMRole
 metadata:
   name: aws-iam-java-example
@@ -112,7 +112,7 @@ spec:
         secret:
           secretName: aws-iam-python-example # name of the AWSIAMRole resource
 ---
-apiVersion: amazonaws.com/v1
+apiVersion: zalando.org/v1
 kind: AWSIAMRole
 metadata:
   name: aws-iam-python-example
@@ -181,7 +181,7 @@ spec:
         secret:
           secretName: aws-iam-golang-example # name of the AWSIAMRole resource
 ---
-apiVersion: amazonaws.com/v1
+apiVersion: zalando.org/v1
 kind: AWSIAMRole
 metadata:
   name: aws-iam-golang-example

hack/update-codegen.sh

@@ -20,7 +20,7 @@ set -o pipefail
 
 SRC="github.com"
 GOPKG="$SRC/mikkeloscar/kube-aws-iam-controller"
-CUSTOM_RESOURCE_NAME="amazonaws.com"
+CUSTOM_RESOURCE_NAME="zalando.org"
 CUSTOM_RESOURCE_VERSION="v1"
 
 SCRIPT_ROOT="$(dirname "${BASH_SOURCE[0]}")/.."

pkg/apis/amazonaws.com/register.go → pkg/apis/zalando.org/register.go

@@ -1,6 +1,6 @@
-package amazonaws
+package zalando
 
 const (
 	// GroupName is the group name used in this package.
-	GroupName = "amazonaws.com"
+	GroupName = "zalando.org"
 )

pkg/apis/amazonaws.com/v1/register.go → pkg/apis/zalando.org/v1/register.go

@@ -1,7 +1,7 @@
 package v1
 
 import (
-	amazonaws "github.com/mikkeloscar/kube-aws-iam-controller/pkg/apis/amazonaws.com"
+	zalando "github.com/mikkeloscar/kube-aws-iam-controller/pkg/apis/zalando.org"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -15,7 +15,7 @@ var (
 )
 
 // SchemeGroupVersion is the group version used to register these objects.
-var SchemeGroupVersion = schema.GroupVersion{Group: amazonaws.GroupName, Version: "v1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: zalando.GroupName, Version: "v1"}
 
 // Resource takes an unqualified resource and returns a Group-qualified GroupResource.
 func Resource(resource string) schema.GroupResource {