Skip to content

Commit d7f658f

Browse files
tantonatantona
authored
Merge pull request #60 from tantona/at/use-ownerref-helpers
use controller ref helper and add clusterrole/serviceaccount/clusterr…
2 parents ed25c2e + eb54ed2 commit d7f658f

File tree

9 files changed

+28
-104
lines changed

9 files changed

+28
-104
lines changed

‎pkg/controller/clusterrole/clusterrole_controller.go‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"reflect"
1919
"time"
2020

21+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
22+
2123
"github.com/aws/aws-sdk-go/aws/session"
2224
clusterv1alpha1 "github.com/awslabs/aws-eks-cluster-controller/pkg/apis/cluster/v1alpha1"
2325
componentsv1alpha1 "github.com/awslabs/aws-eks-cluster-controller/pkg/apis/components/v1alpha1"
@@ -139,19 +141,8 @@ func (r *ReconcileClusterRole) Reconcile(request reconcile.Request) (reconcile.R
139141
}
140142
log.Info("got cluster", zap.String("ClusterName", cluster.Name))
141143

142-
if len(instance.ObjectMeta.OwnerReferences) < 1 {
143-
// Add Owner Reference
144-
instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
145-
{
146-
APIVersion: "cluster.eks.amazonaws.com/v1alpha1",
147-
Kind: "EKS",
148-
Name: cluster.ObjectMeta.Name,
149-
UID: cluster.ObjectMeta.UID,
150-
},
151-
}
152-
if err := r.Client.Update(context.TODO(), instance); err != nil {
153-
return reconcile.Result{}, err
154-
}
144+
if err := controllerutil.SetControllerReference(cluster, instance, r.scheme); err != nil {
145+
return reconcile.Result{}, nil
155146
}
156147

157148
client, err := r.auth.GetClient(cluster)

‎pkg/controller/clusterrolebinding/clusterrolebinding_controller.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/types"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
"sigs.k8s.io/controller-runtime/pkg/controller"
35+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3536
"sigs.k8s.io/controller-runtime/pkg/handler"
3637
"sigs.k8s.io/controller-runtime/pkg/manager"
3738
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -140,19 +141,8 @@ func (r *ReconcileClusterRoleBinding) Reconcile(request reconcile.Request) (reco
140141
}
141142
log.Info("got cluster", zap.String("ClusterName", cluster.Name))
142143

143-
if len(instance.ObjectMeta.OwnerReferences) < 1 {
144-
// Add Owner Reference
145-
instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
146-
{
147-
APIVersion: "cluster.eks.amazonaws.com/v1alpha1",
148-
Kind: "EKS",
149-
Name: cluster.ObjectMeta.Name,
150-
UID: cluster.ObjectMeta.UID,
151-
},
152-
}
153-
if err := r.Client.Update(context.TODO(), instance); err != nil {
154-
return reconcile.Result{}, err
155-
}
144+
if err := controllerutil.SetControllerReference(cluster, instance, r.scheme); err != nil {
145+
return reconcile.Result{}, nil
156146
}
157147

158148
client, err := r.auth.GetClient(cluster)

‎pkg/controller/configmap/configmap_controller.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/types"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
"sigs.k8s.io/controller-runtime/pkg/controller"
35+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3536
"sigs.k8s.io/controller-runtime/pkg/handler"
3637
"sigs.k8s.io/controller-runtime/pkg/manager"
3738
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -132,19 +133,8 @@ func (r *ReconcileConfigMap) Reconcile(request reconcile.Request) (reconcile.Res
132133
}
133134
log.Info("got cluster", zap.String("ClusterName", cluster.Name))
134135

135-
if len(instance.ObjectMeta.OwnerReferences) < 1 {
136-
// Add Owner Reference
137-
instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
138-
{
139-
APIVersion: "cluster.eks.amazonaws.com/v1alpha1",
140-
Kind: "EKS",
141-
Name: cluster.ObjectMeta.Name,
142-
UID: cluster.ObjectMeta.UID,
143-
},
144-
}
145-
if err := r.Client.Update(context.TODO(), instance); err != nil {
146-
return reconcile.Result{}, err
147-
}
136+
if err := controllerutil.SetControllerReference(cluster, instance, r.scheme); err != nil {
137+
return reconcile.Result{}, nil
148138
}
149139

150140
client, err := r.auth.GetClient(cluster)

‎pkg/controller/deployment/deployment_controller.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
"k8s.io/apimachinery/pkg/types"
3838
"sigs.k8s.io/controller-runtime/pkg/client"
3939
"sigs.k8s.io/controller-runtime/pkg/controller"
40+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4041
"sigs.k8s.io/controller-runtime/pkg/handler"
4142
"sigs.k8s.io/controller-runtime/pkg/manager"
4243
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -148,19 +149,8 @@ func (r *ReconcileDeployment) Reconcile(request reconcile.Request) (reconcile.Re
148149
}
149150
log.Info("got cluster", zap.String("ClusterName", cluster.Name))
150151

151-
if len(instance.ObjectMeta.OwnerReferences) < 1 {
152-
// Add Owner Reference
153-
instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
154-
{
155-
APIVersion: "cluster.eks.amazonaws.com/v1alpha1",
156-
Kind: "EKS",
157-
Name: cluster.ObjectMeta.Name,
158-
UID: cluster.ObjectMeta.UID,
159-
},
160-
}
161-
if err := r.Client.Update(context.TODO(), instance); err != nil {
162-
return reconcile.Result{}, err
163-
}
152+
if err := controllerutil.SetControllerReference(cluster, instance, r.scheme); err != nil {
153+
return reconcile.Result{}, nil
164154
}
165155

166156
client, err := r.auth.GetClient(cluster)

‎pkg/controller/eks/components.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ var componentsToDelete = []runtime.Object{
1717
&componentsv1alpha1.IngressList{},
1818
&componentsv1alpha1.SecretList{},
1919
&componentsv1alpha1.ServiceList{},
20+
&componentsv1alpha1.ServiceAccountList{},
21+
&componentsv1alpha1.ClusterRoleList{},
22+
&componentsv1alpha1.ClusterRoleBindingList{},
2023
}
2124

2225
func deleteComponents(ownerName, ownerNamespace string, c client.Client, logger *zap.Logger) (int, error) {

‎pkg/controller/ingress/ingress_controller.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/types"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
"sigs.k8s.io/controller-runtime/pkg/controller"
35+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3536
"sigs.k8s.io/controller-runtime/pkg/handler"
3637
"sigs.k8s.io/controller-runtime/pkg/manager"
3738
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -130,19 +131,8 @@ func (r *ReconcileIngress) Reconcile(request reconcile.Request) (reconcile.Resul
130131
}
131132
log.Info("got cluster", zap.String("ClusterName", cluster.Name))
132133

133-
if len(instance.ObjectMeta.OwnerReferences) < 1 {
134-
// Add Owner Reference
135-
instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
136-
{
137-
APIVersion: "cluster.eks.amazonaws.com/v1alpha1",
138-
Kind: "EKS",
139-
Name: cluster.ObjectMeta.Name,
140-
UID: cluster.ObjectMeta.UID,
141-
},
142-
}
143-
if err := r.Client.Update(context.TODO(), instance); err != nil {
144-
return reconcile.Result{}, err
145-
}
134+
if err := controllerutil.SetControllerReference(cluster, instance, r.scheme); err != nil {
135+
return reconcile.Result{}, nil
146136
}
147137

148138
client, err := r.auth.GetClient(cluster)

‎pkg/controller/secret/secret_controller.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/types"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
"sigs.k8s.io/controller-runtime/pkg/controller"
35+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3536
"sigs.k8s.io/controller-runtime/pkg/handler"
3637
"sigs.k8s.io/controller-runtime/pkg/manager"
3738
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -131,19 +132,8 @@ func (r *ReconcileSecret) Reconcile(request reconcile.Request) (reconcile.Result
131132
}
132133
log.Info("got cluster", zap.String("ClusterName", cluster.Name))
133134

134-
if len(instance.ObjectMeta.OwnerReferences) < 1 {
135-
// Add Owner Reference
136-
instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
137-
{
138-
APIVersion: "cluster.eks.amazonaws.com/v1alpha1",
139-
Kind: "EKS",
140-
Name: cluster.ObjectMeta.Name,
141-
UID: cluster.ObjectMeta.UID,
142-
},
143-
}
144-
if err := r.Client.Update(context.TODO(), instance); err != nil {
145-
return reconcile.Result{}, err
146-
}
135+
if err := controllerutil.SetControllerReference(cluster, instance, r.scheme); err != nil {
136+
return reconcile.Result{}, nil
147137
}
148138

149139
client, err := r.auth.GetClient(cluster)

‎pkg/controller/service/service_controller.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/types"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
"sigs.k8s.io/controller-runtime/pkg/controller"
35+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3536
"sigs.k8s.io/controller-runtime/pkg/handler"
3637
"sigs.k8s.io/controller-runtime/pkg/manager"
3738
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -130,19 +131,8 @@ func (r *ReconcileService) Reconcile(request reconcile.Request) (reconcile.Resul
130131
}
131132
log.Info("got cluster", zap.String("ClusterName", cluster.Name))
132133

133-
if len(instance.ObjectMeta.OwnerReferences) < 1 {
134-
// Add Owner Reference
135-
instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
136-
{
137-
APIVersion: "cluster.eks.amazonaws.com/v1alpha1",
138-
Kind: "EKS",
139-
Name: cluster.ObjectMeta.Name,
140-
UID: cluster.ObjectMeta.UID,
141-
},
142-
}
143-
if err := r.Client.Update(context.TODO(), instance); err != nil {
144-
return reconcile.Result{}, err
145-
}
134+
if err := controllerutil.SetControllerReference(cluster, instance, r.scheme); err != nil {
135+
return reconcile.Result{}, nil
146136
}
147137

148138
client, err := r.auth.GetClient(cluster)

‎pkg/controller/serviceaccount/serviceaccount_controller.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/types"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
"sigs.k8s.io/controller-runtime/pkg/controller"
35+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3536
"sigs.k8s.io/controller-runtime/pkg/handler"
3637
"sigs.k8s.io/controller-runtime/pkg/manager"
3738
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -129,19 +130,8 @@ func (r *ReconcileServiceAccount) Reconcile(request reconcile.Request) (reconcil
129130
}
130131
log.Info("got cluster", zap.String("ClusterName", cluster.Name))
131132

132-
if len(instance.ObjectMeta.OwnerReferences) < 1 {
133-
// Add Owner Reference
134-
instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
135-
{
136-
APIVersion: "cluster.eks.amazonaws.com/v1alpha1",
137-
Kind: "EKS",
138-
Name: cluster.ObjectMeta.Name,
139-
UID: cluster.ObjectMeta.UID,
140-
},
141-
}
142-
if err := r.Client.Update(context.TODO(), instance); err != nil {
143-
return reconcile.Result{}, err
144-
}
133+
if err := controllerutil.SetControllerReference(cluster, instance, r.scheme); err != nil {
134+
return reconcile.Result{}, nil
145135
}
146136

147137
client, err := r.auth.GetClient(cluster)

0 commit comments

Comments
 (0)