Skip to content

Commit 027be8f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2806 from camilamacedo86/improve-var
✨ (deploy-image/v1-alpha) : improve variable name used
2 parents 9006961 + 9f96c89 commit 027be8f

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func (s *apiScaffolder) scafffoldControllerWithImage(scaffold *machinery.Scaffol
177177
"ALL",
178178
},
179179
},
180-
},`, fmt.Sprintf(portTemplate, strings.ToLower(s.resource.Kind)))
180+
},`, fmt.Sprintf(portTemplate, strings.ToLower(s.resource.Kind), strings.ToLower(s.resource.Kind)))
181181
if err != nil {
182182
return fmt.Errorf("error scaffolding container port in the controller: %v", err)
183183
}
@@ -242,6 +242,6 @@ const commandTemplate = `
242242

243243
const portTemplate = `
244244
Ports: []corev1.ContainerPort{{
245-
ContainerPort: m.Spec.ContainerPort,
245+
ContainerPort: %s.Spec.ContainerPort,
246246
Name: "%s",
247247
}},`

‎pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,14 @@ func (r *{{ .Resource.Kind }}Reconciler) Reconcile(ctx context.Context, req ctrl
172172
}
173173
174174
// deploymentFor{{ .Resource.Kind }} returns a {{ .Resource.Kind }} Deployment object
175-
func (r *{{ .Resource.Kind }}Reconciler) deploymentFor{{ .Resource.Kind }}(m *{{ .Resource.ImportAlias }}.{{ .Resource.Kind }}) *appsv1.Deployment {
176-
ls := labelsFor{{ .Resource.Kind }}(m.Name)
177-
replicas := m.Spec.Size
175+
func (r *{{ .Resource.Kind }}Reconciler) deploymentFor{{ .Resource.Kind }}({{ lower .Resource.Kind }} *{{ .Resource.ImportAlias }}.{{ .Resource.Kind }}) *appsv1.Deployment {
176+
ls := labelsFor{{ .Resource.Kind }}({{ lower .Resource.Kind }}.Name)
177+
replicas := {{ lower .Resource.Kind }}.Spec.Size
178178
179179
dep := &appsv1.Deployment{
180180
ObjectMeta: metav1.ObjectMeta{
181-
Name: m.Name,
182-
Namespace: m.Namespace,
181+
Name: {{ lower .Resource.Kind }}.Name,
182+
Namespace: {{ lower .Resource.Kind }}.Namespace,
183183
},
184184
Spec: appsv1.DeploymentSpec{
185185
Replicas: &replicas,
@@ -210,7 +210,7 @@ func (r *{{ .Resource.Kind }}Reconciler) deploymentFor{{ .Resource.Kind }}(m *{{
210210
// which are created by your controller so that when the Custom Resource be deleted
211211
// all resources owned by it (child) will also be deleted.
212212
// To know more about it see: https://kubernetes.io/docs/tasks/administer-cluster/use-cascading-deletion/
213-
ctrl.SetControllerReference(m, dep, r.Scheme)
213+
ctrl.SetControllerReference({{ lower .Resource.Kind }}, dep, r.Scheme)
214214
return dep
215215
}
216216

‎testdata/project-v3-with-deploy-image/controllers/busybox_controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ func (r *BusyboxReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
124124
}
125125

126126
// deploymentForBusybox returns a Busybox Deployment object
127-
func (r *BusyboxReconciler) deploymentForBusybox(m *examplecomv1alpha1.Busybox) *appsv1.Deployment {
128-
ls := labelsForBusybox(m.Name)
129-
replicas := m.Spec.Size
127+
func (r *BusyboxReconciler) deploymentForBusybox(busybox *examplecomv1alpha1.Busybox) *appsv1.Deployment {
128+
ls := labelsForBusybox(busybox.Name)
129+
replicas := busybox.Spec.Size
130130

131131
dep := &appsv1.Deployment{
132132
ObjectMeta: metav1.ObjectMeta{
133-
Name: m.Name,
134-
Namespace: m.Namespace,
133+
Name: busybox.Name,
134+
Namespace: busybox.Namespace,
135135
},
136136
Spec: appsv1.DeploymentSpec{
137137
Replicas: &replicas,
@@ -177,7 +177,7 @@ func (r *BusyboxReconciler) deploymentForBusybox(m *examplecomv1alpha1.Busybox)
177177
// which are created by your controller so that when the Custom Resource be deleted
178178
// all resources owned by it (child) will also be deleted.
179179
// To know more about it see: https://kubernetes.io/docs/tasks/administer-cluster/use-cascading-deletion/
180-
ctrl.SetControllerReference(m, dep, r.Scheme)
180+
ctrl.SetControllerReference(busybox, dep, r.Scheme)
181181
return dep
182182
}
183183

‎testdata/project-v3-with-deploy-image/controllers/memcached_controller.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ func (r *MemcachedReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
124124
}
125125

126126
// deploymentForMemcached returns a Memcached Deployment object
127-
func (r *MemcachedReconciler) deploymentForMemcached(m *examplecomv1alpha1.Memcached) *appsv1.Deployment {
128-
ls := labelsForMemcached(m.Name)
129-
replicas := m.Spec.Size
127+
func (r *MemcachedReconciler) deploymentForMemcached(memcached *examplecomv1alpha1.Memcached) *appsv1.Deployment {
128+
ls := labelsForMemcached(memcached.Name)
129+
replicas := memcached.Spec.Size
130130

131131
dep := &appsv1.Deployment{
132132
ObjectMeta: metav1.ObjectMeta{
133-
Name: m.Name,
134-
Namespace: m.Namespace,
133+
Name: memcached.Name,
134+
Namespace: memcached.Namespace,
135135
},
136136
Spec: appsv1.DeploymentSpec{
137137
Replicas: &replicas,
@@ -169,7 +169,7 @@ func (r *MemcachedReconciler) deploymentForMemcached(m *examplecomv1alpha1.Memca
169169
},
170170
},
171171
Ports: []corev1.ContainerPort{{
172-
ContainerPort: m.Spec.ContainerPort,
172+
ContainerPort: memcached.Spec.ContainerPort,
173173
Name: "memcached",
174174
}},
175175
Command: []string{"memcached", "-m=64", "-o", "modern", "-v"},
@@ -183,7 +183,7 @@ func (r *MemcachedReconciler) deploymentForMemcached(m *examplecomv1alpha1.Memca
183183
// which are created by your controller so that when the Custom Resource be deleted
184184
// all resources owned by it (child) will also be deleted.
185185
// To know more about it see: https://kubernetes.io/docs/tasks/administer-cluster/use-cascading-deletion/
186-
ctrl.SetControllerReference(m, dep, r.Scheme)
186+
ctrl.SetControllerReference(memcached, dep, r.Scheme)
187187
return dep
188188
}
189189

‎testdata/project-v4-with-deploy-image/controllers/busybox_controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ func (r *BusyboxReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
124124
}
125125

126126
// deploymentForBusybox returns a Busybox Deployment object
127-
func (r *BusyboxReconciler) deploymentForBusybox(m *examplecomv1alpha1.Busybox) *appsv1.Deployment {
128-
ls := labelsForBusybox(m.Name)
129-
replicas := m.Spec.Size
127+
func (r *BusyboxReconciler) deploymentForBusybox(busybox *examplecomv1alpha1.Busybox) *appsv1.Deployment {
128+
ls := labelsForBusybox(busybox.Name)
129+
replicas := busybox.Spec.Size
130130

131131
dep := &appsv1.Deployment{
132132
ObjectMeta: metav1.ObjectMeta{
133-
Name: m.Name,
134-
Namespace: m.Namespace,
133+
Name: busybox.Name,
134+
Namespace: busybox.Namespace,
135135
},
136136
Spec: appsv1.DeploymentSpec{
137137
Replicas: &replicas,
@@ -177,7 +177,7 @@ func (r *BusyboxReconciler) deploymentForBusybox(m *examplecomv1alpha1.Busybox)
177177
// which are created by your controller so that when the Custom Resource be deleted
178178
// all resources owned by it (child) will also be deleted.
179179
// To know more about it see: https://kubernetes.io/docs/tasks/administer-cluster/use-cascading-deletion/
180-
ctrl.SetControllerReference(m, dep, r.Scheme)
180+
ctrl.SetControllerReference(busybox, dep, r.Scheme)
181181
return dep
182182
}
183183

‎testdata/project-v4-with-deploy-image/controllers/memcached_controller.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ func (r *MemcachedReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
124124
}
125125

126126
// deploymentForMemcached returns a Memcached Deployment object
127-
func (r *MemcachedReconciler) deploymentForMemcached(m *examplecomv1alpha1.Memcached) *appsv1.Deployment {
128-
ls := labelsForMemcached(m.Name)
129-
replicas := m.Spec.Size
127+
func (r *MemcachedReconciler) deploymentForMemcached(memcached *examplecomv1alpha1.Memcached) *appsv1.Deployment {
128+
ls := labelsForMemcached(memcached.Name)
129+
replicas := memcached.Spec.Size
130130

131131
dep := &appsv1.Deployment{
132132
ObjectMeta: metav1.ObjectMeta{
133-
Name: m.Name,
134-
Namespace: m.Namespace,
133+
Name: memcached.Name,
134+
Namespace: memcached.Namespace,
135135
},
136136
Spec: appsv1.DeploymentSpec{
137137
Replicas: &replicas,
@@ -169,7 +169,7 @@ func (r *MemcachedReconciler) deploymentForMemcached(m *examplecomv1alpha1.Memca
169169
},
170170
},
171171
Ports: []corev1.ContainerPort{{
172-
ContainerPort: m.Spec.ContainerPort,
172+
ContainerPort: memcached.Spec.ContainerPort,
173173
Name: "memcached",
174174
}},
175175
Command: []string{"memcached", "-m=64", "-o", "modern", "-v"},
@@ -183,7 +183,7 @@ func (r *MemcachedReconciler) deploymentForMemcached(m *examplecomv1alpha1.Memca
183183
// which are created by your controller so that when the Custom Resource be deleted
184184
// all resources owned by it (child) will also be deleted.
185185
// To know more about it see: https://kubernetes.io/docs/tasks/administer-cluster/use-cascading-deletion/
186-
ctrl.SetControllerReference(m, dep, r.Scheme)
186+
ctrl.SetControllerReference(memcached, dep, r.Scheme)
187187
return dep
188188
}
189189

0 commit comments

Comments
 (0)