Skip to content

Commit 3798e7f

Browse files
jaideepr97jaideepr97
committed
fix merge conflicts
Signed-off-by: Jaideep Rao <[email protected]>
2 parents 5a223ae + d2fd0df commit 3798e7f

File tree

71 files changed

+3930
-735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3930
-735
lines changed

‎.github/cherry-pick-bot.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
enabled: true
2+
preservePullRequestTitle: true

‎OWNERS

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ approvers:
1111
- anandf
1212
- rnapoles-rh
1313
- jaideepr97
14+
- varshab1210
1415

1516
reviewers:
1617
- sbose78
@@ -28,3 +29,4 @@ reviewers:
2829
- svghadi
2930
- reginapizza
3031
- ciiay
32+
- varshab1210

‎bundle/manifests/argoproj.io_argocds.yaml

+9-101
Original file line numberDiff line numberDiff line change
@@ -548,56 +548,6 @@ spec:
548548
type: integer
549549
type: object
550550
type: object
551-
dex:
552-
description: Dex defines the Dex server options for ArgoCD.
553-
properties:
554-
config:
555-
description: Config is the dex connector configuration.
556-
type: string
557-
groups:
558-
description: Optional list of required groups a user must be a
559-
member of
560-
items:
561-
type: string
562-
type: array
563-
image:
564-
description: Image is the Dex container image.
565-
type: string
566-
openShiftOAuth:
567-
description: OpenShiftOAuth enables OpenShift OAuth authentication
568-
for the Dex server.
569-
type: boolean
570-
resources:
571-
description: Resources defines the Compute Resources required
572-
by the container for Dex.
573-
properties:
574-
limits:
575-
additionalProperties:
576-
anyOf:
577-
- type: integer
578-
- type: string
579-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
580-
x-kubernetes-int-or-string: true
581-
description: 'Limits describes the maximum amount of compute
582-
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
583-
type: object
584-
requests:
585-
additionalProperties:
586-
anyOf:
587-
- type: integer
588-
- type: string
589-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
590-
x-kubernetes-int-or-string: true
591-
description: 'Requests describes the minimum amount of compute
592-
resources required. If Requests is omitted for a container,
593-
it defaults to Limits if that is explicitly specified, otherwise
594-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
595-
type: object
596-
type: object
597-
version:
598-
description: Version is the Dex container image tag.
599-
type: string
600-
type: object
601551
disableAdmin:
602552
description: DisableAdmin will disable the admin user.
603553
type: boolean
@@ -6201,9 +6151,6 @@ spec:
62016151
description: Version is the Dex container image tag.
62026152
type: string
62036153
type: object
6204-
image:
6205-
description: Image is the SSO container image.
6206-
type: string
62076154
keycloak:
62086155
description: Keycloak contains the configuration for Argo CD keycloak
62096156
authentication
@@ -6254,39 +6201,6 @@ spec:
62546201
description: Provider installs and configures the given SSO Provider
62556202
with Argo CD.
62566203
type: string
6257-
resources:
6258-
description: Resources defines the Compute Resources required
6259-
by the container for SSO.
6260-
properties:
6261-
limits:
6262-
additionalProperties:
6263-
anyOf:
6264-
- type: integer
6265-
- type: string
6266-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
6267-
x-kubernetes-int-or-string: true
6268-
description: 'Limits describes the maximum amount of compute
6269-
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
6270-
type: object
6271-
requests:
6272-
additionalProperties:
6273-
anyOf:
6274-
- type: integer
6275-
- type: string
6276-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
6277-
x-kubernetes-int-or-string: true
6278-
description: 'Requests describes the minimum amount of compute
6279-
resources required. If Requests is omitted for a container,
6280-
it defaults to Limits if that is explicitly specified, otherwise
6281-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
6282-
type: object
6283-
type: object
6284-
verifyTLS:
6285-
description: VerifyTLS set to false disables strict TLS validation.
6286-
type: boolean
6287-
version:
6288-
description: Version is the SSO container image tag.
6289-
type: string
62906204
type: object
62916205
statusBadgeEnabled:
62926206
description: StatusBadgeEnabled toggles application status badge feature.
@@ -6350,16 +6264,6 @@ spec:
63506264
component Pods had a failure. Unknown: The state of the Argo CD
63516265
applicationSet controller component could not be obtained.'
63526266
type: string
6353-
dex:
6354-
description: 'Dex is a simple, high-level summary of where the Argo
6355-
CD Dex component is in its lifecycle. There are four possible dex
6356-
values: Pending: The Argo CD Dex component has been accepted by
6357-
the Kubernetes system, but one or more of the required resources
6358-
have not been created. Running: All of the required Pods for the
6359-
Argo CD Dex component are in a Ready state. Failed: At least one
6360-
of the Argo CD Dex component Pods had a failure. Unknown: The state
6361-
of the Argo CD Dex component could not be obtained.'
6362-
type: string
63636267
host:
63646268
description: Host is the hostname of the Ingress.
63656269
type: string
@@ -6424,11 +6328,15 @@ spec:
64246328
one of the Argo CD server component Pods had a failure. Unknown:
64256329
The state of the Argo CD server component could not be obtained.'
64266330
type: string
6427-
ssoConfig:
6428-
description: 'SSOConfig defines the status of SSO configuration. Success:
6429-
Only one SSO provider is configured in CR. Failed: SSO configuration
6430-
is illegal or more than one SSO providers are configured in CR.
6431-
Unknown: The SSO configuration could not be obtained.'
6331+
sso:
6332+
description: 'SSO is a simple, high-level summary of where the Argo
6333+
CD SSO(Dex/Keycloak) component is in its lifecycle. There are four
6334+
possible sso values: Pending: The Argo CD SSO component has been
6335+
accepted by the Kubernetes system, but one or more of the required
6336+
resources have not been created. Running: All of the required Pods
6337+
for the Argo CD SSO component are in a Ready state. Failed: At least
6338+
one of the Argo CD SSO component Pods had a failure. Unknown: The
6339+
state of the Argo CD SSO component could not be obtained.'
64326340
type: string
64336341
type: object
64346342
type: object

‎config/crd/bases/argoproj.io_argocds.yaml

+9-101
Original file line numberDiff line numberDiff line change
@@ -550,56 +550,6 @@ spec:
550550
type: integer
551551
type: object
552552
type: object
553-
dex:
554-
description: Dex defines the Dex server options for ArgoCD.
555-
properties:
556-
config:
557-
description: Config is the dex connector configuration.
558-
type: string
559-
groups:
560-
description: Optional list of required groups a user must be a
561-
member of
562-
items:
563-
type: string
564-
type: array
565-
image:
566-
description: Image is the Dex container image.
567-
type: string
568-
openShiftOAuth:
569-
description: OpenShiftOAuth enables OpenShift OAuth authentication
570-
for the Dex server.
571-
type: boolean
572-
resources:
573-
description: Resources defines the Compute Resources required
574-
by the container for Dex.
575-
properties:
576-
limits:
577-
additionalProperties:
578-
anyOf:
579-
- type: integer
580-
- type: string
581-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
582-
x-kubernetes-int-or-string: true
583-
description: 'Limits describes the maximum amount of compute
584-
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
585-
type: object
586-
requests:
587-
additionalProperties:
588-
anyOf:
589-
- type: integer
590-
- type: string
591-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
592-
x-kubernetes-int-or-string: true
593-
description: 'Requests describes the minimum amount of compute
594-
resources required. If Requests is omitted for a container,
595-
it defaults to Limits if that is explicitly specified, otherwise
596-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
597-
type: object
598-
type: object
599-
version:
600-
description: Version is the Dex container image tag.
601-
type: string
602-
type: object
603553
disableAdmin:
604554
description: DisableAdmin will disable the admin user.
605555
type: boolean
@@ -6203,9 +6153,6 @@ spec:
62036153
description: Version is the Dex container image tag.
62046154
type: string
62056155
type: object
6206-
image:
6207-
description: Image is the SSO container image.
6208-
type: string
62096156
keycloak:
62106157
description: Keycloak contains the configuration for Argo CD keycloak
62116158
authentication
@@ -6256,39 +6203,6 @@ spec:
62566203
description: Provider installs and configures the given SSO Provider
62576204
with Argo CD.
62586205
type: string
6259-
resources:
6260-
description: Resources defines the Compute Resources required
6261-
by the container for SSO.
6262-
properties:
6263-
limits:
6264-
additionalProperties:
6265-
anyOf:
6266-
- type: integer
6267-
- type: string
6268-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
6269-
x-kubernetes-int-or-string: true
6270-
description: 'Limits describes the maximum amount of compute
6271-
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
6272-
type: object
6273-
requests:
6274-
additionalProperties:
6275-
anyOf:
6276-
- type: integer
6277-
- type: string
6278-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
6279-
x-kubernetes-int-or-string: true
6280-
description: 'Requests describes the minimum amount of compute
6281-
resources required. If Requests is omitted for a container,
6282-
it defaults to Limits if that is explicitly specified, otherwise
6283-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
6284-
type: object
6285-
type: object
6286-
verifyTLS:
6287-
description: VerifyTLS set to false disables strict TLS validation.
6288-
type: boolean
6289-
version:
6290-
description: Version is the SSO container image tag.
6291-
type: string
62926206
type: object
62936207
statusBadgeEnabled:
62946208
description: StatusBadgeEnabled toggles application status badge feature.
@@ -6352,16 +6266,6 @@ spec:
63526266
component Pods had a failure. Unknown: The state of the Argo CD
63536267
applicationSet controller component could not be obtained.'
63546268
type: string
6355-
dex:
6356-
description: 'Dex is a simple, high-level summary of where the Argo
6357-
CD Dex component is in its lifecycle. There are four possible dex
6358-
values: Pending: The Argo CD Dex component has been accepted by
6359-
the Kubernetes system, but one or more of the required resources
6360-
have not been created. Running: All of the required Pods for the
6361-
Argo CD Dex component are in a Ready state. Failed: At least one
6362-
of the Argo CD Dex component Pods had a failure. Unknown: The state
6363-
of the Argo CD Dex component could not be obtained.'
6364-
type: string
63656269
host:
63666270
description: Host is the hostname of the Ingress.
63676271
type: string
@@ -6426,11 +6330,15 @@ spec:
64266330
one of the Argo CD server component Pods had a failure. Unknown:
64276331
The state of the Argo CD server component could not be obtained.'
64286332
type: string
6429-
ssoConfig:
6430-
description: 'SSOConfig defines the status of SSO configuration. Success:
6431-
Only one SSO provider is configured in CR. Failed: SSO configuration
6432-
is illegal or more than one SSO providers are configured in CR.
6433-
Unknown: The SSO configuration could not be obtained.'
6333+
sso:
6334+
description: 'SSO is a simple, high-level summary of where the Argo
6335+
CD SSO(Dex/Keycloak) component is in its lifecycle. There are four
6336+
possible sso values: Pending: The Argo CD SSO component has been
6337+
accepted by the Kubernetes system, but one or more of the required
6338+
resources have not been created. Running: All of the required Pods
6339+
for the Argo CD SSO component are in a Ready state. Failed: At least
6340+
one of the Argo CD SSO component Pods had a failure. Unknown: The
6341+
state of the Argo CD SSO component could not be obtained.'
64346342
type: string
64356343
type: object
64366344
type: object

‎controllers/argocd/argocd.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ import (
2828
var (
2929
defaultAdminPolicy = "g, system:cluster-admins, role:admin\ng, cluster-admins, role:admin\n"
3030
defaultScope = "[groups]"
31+
32+
//The policy.default property in the argocd-rbac-cm ConfigMap.
33+
defaultArgoCDRole = ""
3134
)
3235

3336
// resource exclusions for the ArgoCD CR.
@@ -169,8 +172,9 @@ func getArgoServerSpec() argoapp.ArgoCDServerSpec {
169172

170173
func getDefaultRBAC() argoapp.ArgoCDRBACSpec {
171174
return argoapp.ArgoCDRBACSpec{
172-
Policy: &defaultAdminPolicy,
173-
Scopes: &defaultScope,
175+
Policy: &defaultAdminPolicy,
176+
Scopes: &defaultScope,
177+
DefaultPolicy: &defaultArgoCDRole,
174178
}
175179
}
176180

‎controllers/argocd/argocd_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,11 @@ func TestDexConfiguration(t *testing.T) {
135135
// Verify the default RBAC
136136
testAdminPolicy := "g, system:cluster-admins, role:admin\ng, cluster-admins, role:admin\n"
137137
testDefaultScope := "[groups]"
138-
138+
testDefaultArgoCDRole := ""
139139
testRBAC := argoapp.ArgoCDRBACSpec{
140-
Policy: &testAdminPolicy,
141-
Scopes: &testDefaultScope,
140+
Policy: &testAdminPolicy,
141+
Scopes: &testDefaultScope,
142+
DefaultPolicy: &testDefaultArgoCDRole,
142143
}
143144
assert.DeepEqual(t, testArgoCD.Spec.RBAC, testRBAC)
144145
}

0 commit comments

Comments
 (0)