Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ab22dfd

Browse files
Add app.kubernetes.io/component label
1 parent 0a1573c commit ab22dfd

File tree

11 files changed

+24
-22
lines changed

11 files changed

+24
-22
lines changed

‎internal/metadata/labels.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ import (
99

1010
const NameLabel = "app.kubernetes.io/name"
1111
const PartOfLabel = "app.kubernetes.io/part-of"
12+
const ComponentLabel = "app.kubernetes.io/component"
1213
const GenerationLabel = "osrmcluster.itayankri/cluster-generation"
1314

14-
func GetLabels(instance *osrmv1alpha1.OSRMCluster, instanceLabelsmap[string]string) map[string]string {
15+
func GetLabels(instance *osrmv1alpha1.OSRMCluster, componentNamestring) map[string]string {
1516
labels := map[string]string{
1617
NameLabel: instance.Name,
1718
PartOfLabel: "osrmcluster",
19+
ComponentLabel: componentName,
1820
GenerationLabel: strconv.FormatInt(instance.ObjectMeta.Generation, 10),
1921
}
2022

21-
for label, value := range instanceLabels {
23+
for label, value := range instance.Labels {
2224
if !strings.HasPrefix(label, "app.kubernetes.io") {
2325
labels[label] = value
2426
}

‎internal/resource/cron_job.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ func (builder *CronJobBuilder) Build() (client.Object, error) {
3131
ObjectMeta: metav1.ObjectMeta{
3232
Name: builder.Instance.ChildResourceName(builder.profile.Name, CronJobSuffix),
3333
Namespace: builder.Instance.Namespace,
34-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
34+
Labels: metadata.GetLabels(builder.Instance, builder.profile.Name),
3535
},
3636
}, nil
3737
}
3838

3939
func (builder *CronJobBuilder) Update(object client.Object, siblings []runtime.Object) error {
4040
cronJob := object.(*batchv1.CronJob)
4141

42-
cronJob.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
42+
cronJob.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.profile.Name)
4343

4444
cronJob.Spec = batchv1.CronJobSpec{
4545
Suspend: builder.profile.SpeedUpdates.Suspend,

‎internal/resource/deployment.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (builder *DeploymentBuilder) Build() (client.Object, error) {
3434
ObjectMeta: metav1.ObjectMeta{
3535
Name: builder.Instance.ChildResourceName(builder.profile.Name, DeploymentSuffix),
3636
Namespace: builder.Instance.Namespace,
37-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
37+
Labels: metadata.GetLabels(builder.Instance, builder.profile.Name),
3838
},
3939
}, nil
4040
}
@@ -46,7 +46,7 @@ func (builder *DeploymentBuilder) Update(object client.Object, siblings []runtim
4646
osrmFileName := strings.ReplaceAll(pbfFileName, "osm.pbf", "osrm")
4747
profileSpec := getProfileSpec(builder.profile.Name, builder.Instance)
4848

49-
deployment.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
49+
deployment.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.profile.Name)
5050

5151
deployment.Spec = appsv1.DeploymentSpec{
5252
Replicas: profileSpec.MinReplicas,

‎internal/resource/gateway_config_map.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ func (builder *ConfigMapBuilder) Build() (client.Object, error) {
3333
ObjectMeta: metav1.ObjectMeta{
3434
Name: builder.Instance.ChildResourceName(GatewaySuffix, ConfigMapSuffix),
3535
Namespace: builder.Instance.Namespace,
36-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
36+
Labels: metadata.GetLabels(builder.Instance, "gateway"),
3737
},
3838
}, nil
3939
}
4040

4141
func (builder *ConfigMapBuilder) Update(object client.Object, siblings []runtime.Object) error {
4242
configMap := object.(*corev1.ConfigMap)
43-
configMap.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
43+
configMap.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, "gateway")
4444

4545
if configMap.Data == nil {
4646
configMap.Data = make(map[string]string)

‎internal/resource/gateway_deployment.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ func (builder *GatewayDeploymentBuilder) Build() (client.Object, error) {
3535
ObjectMeta: metav1.ObjectMeta{
3636
Name: builder.Instance.Name,
3737
Namespace: builder.Instance.Namespace,
38-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
38+
Labels: metadata.GetLabels(builder.Instance, "gateway"),
3939
},
4040
}, nil
4141
}
4242

4343
func (builder *GatewayDeploymentBuilder) Update(object client.Object, siblings []runtime.Object) error {
4444
deployment := object.(*appsv1.Deployment)
45-
deployment.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
45+
deployment.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, "gateway")
4646
deployment.Spec = appsv1.DeploymentSpec{
4747
Replicas: &gatewayDefaultReplicas,
4848
Selector: &metav1.LabelSelector{

‎internal/resource/gateway_service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ func (builder *GatewayServiceBuilder) Build() (client.Object, error) {
3131
ObjectMeta: metav1.ObjectMeta{
3232
Name: builder.Instance.Name,
3333
Namespace: builder.Instance.Namespace,
34-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
34+
Labels: metadata.GetLabels(builder.Instance, "gateway"),
3535
},
3636
}, nil
3737
}
3838

3939
func (builder *GatewayServiceBuilder) Update(object client.Object, siblings []runtime.Object) error {
4040
service := object.(*corev1.Service)
4141

42-
service.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
42+
service.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, "gateway")
4343

4444
service.Spec.Ports = []corev1.ServicePort{
4545
{

‎internal/resource/horizontal_pod_autoscaler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (builder *HorizontalPodAutoscalerBuilder) Build() (client.Object, error) {
3030
ObjectMeta: metav1.ObjectMeta{
3131
Name: builder.Instance.ChildResourceName(builder.profile.Name, HorizontalPodAutoscalerSuffix),
3232
Namespace: builder.Instance.Namespace,
33-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
33+
Labels: metadata.GetLabels(builder.Instance, builder.profile.Name),
3434
},
3535
}, nil
3636
}
@@ -39,7 +39,7 @@ func (builder *HorizontalPodAutoscalerBuilder) Update(object client.Object, sibl
3939
name := builder.Instance.ChildResourceName(builder.profile.Name, HorizontalPodAutoscalerSuffix)
4040
hpa := object.(*autoscalingv1.HorizontalPodAutoscaler)
4141

42-
hpa.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
42+
hpa.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.profile.Name)
4343

4444
targetCPUUtilizationPercentage := int32(85)
4545
profileSpec := getProfileSpec(builder.profile.Name, builder.Instance)

‎internal/resource/job.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ func (builder *JobBuilder) Build() (client.Object, error) {
3030
ObjectMeta: metav1.ObjectMeta{
3131
Name: builder.Instance.ChildResourceName(builder.profile.Name, JobSuffix),
3232
Namespace: builder.Instance.Namespace,
33-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
33+
Labels: metadata.GetLabels(builder.Instance, builder.profile.Name),
3434
},
3535
}, nil
3636
}
3737

3838
func (builder *JobBuilder) Update(object client.Object, siblings []runtime.Object) error {
3939
job := object.(*batchv1.Job)
4040

41-
job.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
41+
job.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.profile.Name)
4242

4343
job.Spec = batchv1.JobSpec{
4444
Selector: job.Spec.Selector,

‎internal/resource/persistent_volume_claim.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (builder *PersistentVolumeClaimBuilder) Build() (client.Object, error) {
3131
ObjectMeta: metav1.ObjectMeta{
3232
Name: name,
3333
Namespace: builder.Instance.Namespace,
34-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
34+
Labels: metadata.GetLabels(builder.Instance, builder.profile.Name),
3535
},
3636
Spec: corev1.PersistentVolumeClaimSpec{
3737
AccessModes: []corev1.PersistentVolumeAccessMode{
@@ -51,7 +51,7 @@ func (builder *PersistentVolumeClaimBuilder) Build() (client.Object, error) {
5151
func (builder *PersistentVolumeClaimBuilder) Update(object client.Object, siblings []runtime.Object) error {
5252
pvc := object.(*corev1.PersistentVolumeClaim)
5353

54-
pvc.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
54+
pvc.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.profile.Name)
5555

5656
if err := controllerutil.SetControllerReference(builder.Instance, pvc, builder.Scheme); err != nil {
5757
return fmt.Errorf("failed setting controller reference: %v", err)

‎internal/resource/pod_disruption_budget.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ func (builder *PodDisruptionBudgetBuilder) Build() (client.Object, error) {
3030
ObjectMeta: metav1.ObjectMeta{
3131
Name: builder.Instance.ChildResourceName(builder.profile.Name, PodDisruptionBudgetSuffix),
3232
Namespace: builder.Instance.Namespace,
33-
Labels: metadata.GetLabels(builder.Instance, builder.Instance.Labels),
33+
Labels: metadata.GetLabels(builder.Instance, builder.profile.Name),
3434
},
3535
}, nil
3636
}
3737

3838
func (builder *PodDisruptionBudgetBuilder) Update(object client.Object, siblings []runtime.Object) error {
3939
name := builder.Instance.ChildResourceName(builder.profile.Name, PodDisruptionBudgetSuffix)
4040
pdb := object.(*policyv1.PodDisruptionBudget)
41-
pdb.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.Instance.Labels)
41+
pdb.ObjectMeta.Labels = metadata.GetLabels(builder.Instance, builder.profile.Name)
4242
pdb.Spec.MinAvailable = builder.profile.GetMinAvailable()
4343
pdb.Spec.Selector = &metav1.LabelSelector{
4444
MatchLabels: map[string]string{

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /