Skip to content

Commit 6348f0e

Browse files
akhilnittalaakhilnittala
authored
Merge branch 'argoproj-labs:master' into master
2 parents a89b09d + 24a3488 commit 6348f0e

32 files changed

Lines changed: 1314 additions & 127 deletions

‎.codecov.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
flags:
2+
unit-tests:
3+
carryforward: true
4+
coverage:
5+
status:
6+
patch:
7+
default:
8+
threshold: 2
9+
project:
10+
default:
11+
threshold: 2
12+
ignore:
13+
- "**/*_test.go"
14+
- "**/mocks/*"
15+
- "test/**/*"
16+
- "vendor/**/*"

‎.github/workflows/go.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,12 @@ jobs:
3131

3232
- name: Test
3333
run: make test
34+
35+
- name: Upload code coverage to codecov.io
36+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
37+
with:
38+
files: cover.out
39+
flags: unit-tests
40+
fail_ci_if_error: false
41+
env:
42+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎controllers/argocd/deployment.go‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ func (r *ReconcileArgoCD) reconcileRedisDeployment(cr *argoproj.ArgoCD, useTLS b
463463
},
464464
}}
465465

466-
deploy.Spec.Template.Spec.ServiceAccountName = fmt.Sprintf("%s-%s", cr.Name, "argocd-redis")
466+
deploy.Spec.Template.Spec.ServiceAccountName = getServiceAccountName(cr.Name, common.ArgoCDRedisComponent)
467467
deploy.Spec.Template.Spec.Volumes = []corev1.Volume{
468468
{
469469
Name: common.ArgoCDRedisServerTLSSecretName,
@@ -751,7 +751,7 @@ func (r *ReconcileArgoCD) reconcileRedisHAProxyDeployment(cr *argoproj.ArgoCD) e
751751
}
752752
AddSeccompProfileForOpenShift(r.Client, &deploy.Spec.Template.Spec)
753753

754-
deploy.Spec.Template.Spec.ServiceAccountName = fmt.Sprintf("%s-%s", cr.Name, "argocd-redis-ha")
754+
deploy.Spec.Template.Spec.ServiceAccountName = getServiceAccountName(cr.Name, common.ArgoCDRedisHAComponent)
755755

756756
version, err := getClusterVersion(r.Client)
757757
if err != nil {
@@ -829,6 +829,10 @@ func (r *ReconcileArgoCD) reconcileRedisHAProxyDeployment(cr *argoproj.ArgoCD) e
829829
existing.Spec.Replicas = deploy.Spec.Replicas
830830
changes = append(changes, "replicas")
831831
}
832+
if !reflect.DeepEqual(deploy.Spec.Template.Spec.ServiceAccountName, existing.Spec.Template.Spec.ServiceAccountName) {
833+
existing.Spec.Template.Spec.ServiceAccountName = deploy.Spec.Template.Spec.ServiceAccountName
834+
changes = append(changes, "serviceAccountName")
835+
}
832836
if len(changes) > 0 {
833837
argoutil.LogResourceUpdate(log, existing, "updating", strings.Join(changes, ", "))
834838
return r.Update(context.TODO(), existing)
@@ -933,7 +937,7 @@ func (r *ReconcileArgoCD) reconcileServerDeployment(cr *argoproj.ArgoCD, useTLSF
933937
SecurityContext: argoutil.DefaultSecurityContext(),
934938
VolumeMounts: serverVolumeMounts,
935939
}}
936-
deploy.Spec.Template.Spec.ServiceAccountName = fmt.Sprintf("%s-%s", cr.Name, "argocd-server")
940+
deploy.Spec.Template.Spec.ServiceAccountName = getServiceAccountName(cr.Name, common.ArgoCDServerComponent)
937941

938942
serverVolumes := []corev1.Volume{
939943
{
@@ -1156,6 +1160,11 @@ func (r *ReconcileArgoCD) reconcileServerDeployment(cr *argoproj.ArgoCD, useTLSF
11561160
changes = append(changes, "labels")
11571161
}
11581162

1163+
if !reflect.DeepEqual(deploy.Spec.Template.Spec.ServiceAccountName, existing.Spec.Template.Spec.ServiceAccountName) {
1164+
existing.Spec.Template.Spec.ServiceAccountName = deploy.Spec.Template.Spec.ServiceAccountName
1165+
changes = append(changes, "serviceAccountName")
1166+
}
1167+
11591168
if len(changes) > 0 {
11601169
argoutil.LogResourceUpdate(log, existing, "updating", strings.Join(changes, ", "))
11611170
return r.Update(context.TODO(), existing)

‎controllers/argocd/deployment_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2999,6 +2999,10 @@ func TestReconcileArgoCD_reconcileRepoServerWithFipsEnabled(t *testing.T) {
29992999
foundEnv = true
30003000
assert.Equal(t, env.Value, "fips140=on", "GODEBUG environment must be set to fips140=on when fips is enabled")
30013001
}
3002+
if env.Name == "GOLANG_FIPS" {
3003+
foundEnv = true
3004+
assert.Equal(t, env.Value, "0", "GOLANG_FIPS environment must be set to 0 when fips is enabled")
3005+
}
30023006
}
30033007
assert.True(t, foundEnv, "environment GODEBUG must be set when FIPS is enabled")
30043008
}

‎controllers/argocd/dex.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ func (r *ReconcileArgoCD) reconcileDexDeployment(cr *argoproj.ArgoCD) error {
480480
VolumeMounts: dexVolumeMounts,
481481
}}
482482

483-
deploy.Spec.Template.Spec.ServiceAccountName = fmt.Sprintf("%s-%s", cr.Name, common.ArgoCDDefaultDexServiceAccountName)
483+
deploy.Spec.Template.Spec.ServiceAccountName = getServiceAccountName(cr.Name, common.ArgoCDDefaultDexServiceAccountName)
484484
deploy.Spec.Template.Spec.Volumes = dexVolumes
485485

486486
existing := newDeploymentWithSuffix("dex-server", "dex-server", cr)
@@ -575,6 +575,11 @@ func (r *ReconcileArgoCD) reconcileDexDeployment(cr *argoproj.ArgoCD) error {
575575
changes = append(changes, "volumes")
576576
}
577577

578+
if !reflect.DeepEqual(deploy.Spec.Template.Spec.ServiceAccountName, existing.Spec.Template.Spec.ServiceAccountName) {
579+
existing.Spec.Template.Spec.ServiceAccountName = deploy.Spec.Template.Spec.ServiceAccountName
580+
changes = append(changes, "serviceAccountName")
581+
}
582+
578583
if len(changes) > 0 {
579584
argoutil.LogResourceUpdate(log, existing, "updating", strings.Join(changes, ", "))
580585
return r.Update(context.TODO(), existing)

‎controllers/argocd/dexUtil.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (r *ReconcileArgoCD) getDexOAuthRedirectURI(cr *argoproj.ArgoCD) (string, e
6262

6363
// getDexOAuthClientID will return the OAuth client ID for the given ArgoCD.
6464
func getDexOAuthClientID(cr *argoproj.ArgoCD) string {
65-
return fmt.Sprintf("system:serviceaccount:%s:%s", cr.Namespace, fmt.Sprintf("%s-%s", cr.Name, common.ArgoCDDefaultDexServiceAccountName))
65+
return fmt.Sprintf("system:serviceaccount:%s:%s", cr.Namespace, getServiceAccountName(cr.Name, common.ArgoCDDefaultDexServiceAccountName))
6666
}
6767

6868
// getDexResources will return the ResourceRequirements for the Dex container.

‎controllers/argocd/ingress.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package argocd
1616

1717
import (
1818
"context"
19-
"fmt"
2019
"reflect"
2120
"strings"
2221

@@ -63,7 +62,7 @@ func newIngressWithName(name string, cr *argoproj.ArgoCD) *networkingv1.Ingress
6362

6463
// newIngressWithSuffix returns a new Ingress with the given name suffix for the ArgoCD.
6564
func newIngressWithSuffix(suffix string, cr *argoproj.ArgoCD) *networkingv1.Ingress {
66-
return newIngressWithName(fmt.Sprintf("%s-%s", cr.Name, suffix), cr)
65+
return newIngressWithName(nameWithSuffix(suffix, cr), cr)
6766
}
6867

6968
// reconcileIngresses will ensure that all ArgoCD Ingress resources are present.

‎controllers/argocd/networkpolicies.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ func (r *ReconcileArgoCD) ReconcileNetworkPolicies(cr *argoproj.ArgoCD) error {
9090

9191
func (r *ReconcileArgoCD) deleteArgoCDNetworkPolicies(cr *argoproj.ArgoCD) error {
9292
names := []string{
93-
fmt.Sprintf("%s-%s", cr.Name, ArgoCDNotificationsControllerNetworkPolicy),
94-
fmt.Sprintf("%s-%s", cr.Name, ArgoCDDexServerNetworkPolicy),
95-
fmt.Sprintf("%s-%s", cr.Name, ArgoCDApplicationSetControllerNetworkPolicy),
96-
fmt.Sprintf("%s-%s", cr.Name, ArgoCDServerNetworkPolicy),
97-
fmt.Sprintf("%s-%s", cr.Name, ArgoCDApplicationControllerNetworkPolicy),
98-
fmt.Sprintf("%s-%s", cr.Name, ArgoCDRepoServerNetworkPolicy),
93+
nameWithSuffix(ArgoCDNotificationsControllerNetworkPolicy, cr),
94+
nameWithSuffix(ArgoCDDexServerNetworkPolicy, cr),
95+
nameWithSuffix(ArgoCDApplicationSetControllerNetworkPolicy, cr),
96+
nameWithSuffix(ArgoCDServerNetworkPolicy, cr),
97+
nameWithSuffix(ArgoCDApplicationControllerNetworkPolicy, cr),
98+
nameWithSuffix(ArgoCDRepoServerNetworkPolicy, cr),
9999
}
100100

101101
for _, name := range names {
@@ -178,7 +178,7 @@ func (r *ReconcileArgoCD) ReconcileDexServerNetworkPolicy(cr *argoproj.ArgoCD) e
178178

179179
existing := &networkingv1.NetworkPolicy{
180180
ObjectMeta: metav1.ObjectMeta{
181-
Name: fmt.Sprintf("%s-%s", cr.Name, ArgoCDDexServerNetworkPolicy),
181+
Name: nameWithSuffix(ArgoCDDexServerNetworkPolicy, cr),
182182
Namespace: cr.Namespace,
183183
},
184184
}
@@ -283,7 +283,7 @@ func (r *ReconcileArgoCD) ReconcileApplicationSetControllerNetworkPolicy(cr *arg
283283

284284
existing := &networkingv1.NetworkPolicy{
285285
ObjectMeta: metav1.ObjectMeta{
286-
Name: fmt.Sprintf("%s-%s", cr.Name, ArgoCDApplicationSetControllerNetworkPolicy),
286+
Name: nameWithSuffix(ArgoCDApplicationSetControllerNetworkPolicy, cr),
287287
Namespace: cr.Namespace,
288288
},
289289
}
@@ -355,7 +355,7 @@ func (r *ReconcileArgoCD) ReconcileRedisNetworkPolicy(cr *argoproj.ArgoCD) error
355355

356356
networkPolicy := &networkingv1.NetworkPolicy{
357357
ObjectMeta: metav1.ObjectMeta{
358-
Name: fmt.Sprintf("%s-%s", cr.Name, RedisNetworkPolicy),
358+
Name: nameWithSuffix(RedisNetworkPolicy, cr),
359359
Namespace: cr.Namespace,
360360
},
361361
Spec: networkingv1.NetworkPolicySpec{
@@ -373,7 +373,7 @@ func (r *ReconcileArgoCD) ReconcileRedisNetworkPolicy(cr *argoproj.ArgoCD) error
373373
{
374374
PodSelector: &metav1.LabelSelector{
375375
MatchLabels: map[string]string{
376-
"app.kubernetes.io/name": nameWithSuffix("application-controller", cr),
376+
"app.kubernetes.io/name": applicationControllerResourceName(cr),
377377
},
378378
},
379379
},
@@ -426,7 +426,7 @@ func (r *ReconcileArgoCD) ReconcileRedisNetworkPolicy(cr *argoproj.ArgoCD) error
426426
// Check if the network policy already exists
427427
existing := &networkingv1.NetworkPolicy{
428428
ObjectMeta: metav1.ObjectMeta{
429-
Name: fmt.Sprintf("%s-%s", cr.Name, RedisNetworkPolicy),
429+
Name: nameWithSuffix(RedisNetworkPolicy, cr),
430430
Namespace: cr.Namespace,
431431
},
432432
}
@@ -496,7 +496,7 @@ func (r *ReconcileArgoCD) ReconcileRedisHANetworkPolicy(cr *argoproj.ArgoCD) err
496496

497497
networkPolicy := &networkingv1.NetworkPolicy{
498498
ObjectMeta: metav1.ObjectMeta{
499-
Name: fmt.Sprintf("%s-%s", cr.Name, RedisHANetworkPolicy),
499+
Name: nameWithSuffix(RedisHANetworkPolicy, cr),
500500
Namespace: cr.Namespace,
501501
},
502502
Spec: networkingv1.NetworkPolicySpec{
@@ -514,7 +514,7 @@ func (r *ReconcileArgoCD) ReconcileRedisHANetworkPolicy(cr *argoproj.ArgoCD) err
514514
{
515515
PodSelector: &metav1.LabelSelector{
516516
MatchLabels: map[string]string{
517-
"app.kubernetes.io/name": nameWithSuffix("application-controller", cr),
517+
"app.kubernetes.io/name": applicationControllerResourceName(cr),
518518
},
519519
},
520520
},
@@ -551,7 +551,7 @@ func (r *ReconcileArgoCD) ReconcileRedisHANetworkPolicy(cr *argoproj.ArgoCD) err
551551
// Check if the network policy already exists
552552
existing := &networkingv1.NetworkPolicy{
553553
ObjectMeta: metav1.ObjectMeta{
554-
Name: fmt.Sprintf("%s-%s", cr.Name, RedisHANetworkPolicy),
554+
Name: nameWithSuffix(RedisHANetworkPolicy, cr),
555555
Namespace: cr.Namespace,
556556
},
557557
}
@@ -651,7 +651,7 @@ func (r *ReconcileArgoCD) ReconcileNotificationsControllerNetworkPolicy(cr *argo
651651

652652
existing := &networkingv1.NetworkPolicy{
653653
ObjectMeta: metav1.ObjectMeta{
654-
Name: fmt.Sprintf("%s-%s", cr.Name, ArgoCDNotificationsControllerNetworkPolicy),
654+
Name: nameWithSuffix(ArgoCDNotificationsControllerNetworkPolicy, cr),
655655
Namespace: cr.Namespace,
656656
},
657657
}
@@ -739,7 +739,7 @@ func (r *ReconcileArgoCD) ReconcileArgoCDServerNetworkPolicy(cr *argoproj.ArgoCD
739739

740740
existing := &networkingv1.NetworkPolicy{
741741
ObjectMeta: metav1.ObjectMeta{
742-
Name: fmt.Sprintf("%s-%s", cr.Name, ArgoCDServerNetworkPolicy),
742+
Name: nameWithSuffix(ArgoCDServerNetworkPolicy, cr),
743743
Namespace: cr.Namespace,
744744
},
745745
}
@@ -807,7 +807,7 @@ func (r *ReconcileArgoCD) ReconcileArgoCDApplicationControllerNetworkPolicy(cr *
807807
desired.Spec = networkingv1.NetworkPolicySpec{
808808
PodSelector: metav1.LabelSelector{
809809
MatchLabels: map[string]string{
810-
"app.kubernetes.io/name": nameWithSuffix("application-controller", cr),
810+
"app.kubernetes.io/name": applicationControllerResourceName(cr),
811811
},
812812
},
813813
PolicyTypes: []networkingv1.PolicyType{
@@ -833,7 +833,7 @@ func (r *ReconcileArgoCD) ReconcileArgoCDApplicationControllerNetworkPolicy(cr *
833833
// Check if the network policy already exists
834834
existing := &networkingv1.NetworkPolicy{
835835
ObjectMeta: metav1.ObjectMeta{
836-
Name: fmt.Sprintf("%s-%s", cr.Name, ArgoCDApplicationControllerNetworkPolicy),
836+
Name: nameWithSuffix(ArgoCDApplicationControllerNetworkPolicy, cr),
837837
Namespace: cr.Namespace,
838838
},
839839
}
@@ -914,7 +914,7 @@ func (r *ReconcileArgoCD) ReconcileArgoCDRepoServerNetworkPolicy(cr *argoproj.Ar
914914
{
915915
PodSelector: &metav1.LabelSelector{
916916
MatchLabels: map[string]string{
917-
"app.kubernetes.io/name": nameWithSuffix("application-controller", cr),
917+
"app.kubernetes.io/name": applicationControllerResourceName(cr),
918918
},
919919
},
920920
},
@@ -975,7 +975,7 @@ func (r *ReconcileArgoCD) ReconcileArgoCDRepoServerNetworkPolicy(cr *argoproj.Ar
975975
// Check if the network policy already exists
976976
existing := &networkingv1.NetworkPolicy{
977977
ObjectMeta: metav1.ObjectMeta{
978-
Name: fmt.Sprintf("%s-%s", cr.Name, ArgoCDRepoServerNetworkPolicy),
978+
Name: nameWithSuffix(ArgoCDRepoServerNetworkPolicy, cr),
979979
Namespace: cr.Namespace,
980980
},
981981
}
@@ -1038,7 +1038,7 @@ func (r *ReconcileArgoCD) ReconcileArgoCDRepoServerNetworkPolicy(cr *argoproj.Ar
10381038
func returnNetworkPolicyHeaders(cr *argoproj.ArgoCD, NetworkPolicyName string) *networkingv1.NetworkPolicy {
10391039
return &networkingv1.NetworkPolicy{
10401040
ObjectMeta: metav1.ObjectMeta{
1041-
Name: fmt.Sprintf("%s-%s", cr.Name, NetworkPolicyName),
1041+
Name: nameWithSuffix(NetworkPolicyName, cr),
10421042
Namespace: cr.Namespace,
10431043
Labels: argoutil.LabelsForCluster(cr),
10441044
},

0 commit comments

Comments
 (0)