Skip to content

Commit f72116f

Browse files
jaideepr97jaideepr97
authored
Merge pull request #405 from jaideepr97/v1.7
chore: pick up latest commit and update CRDs for resource customization subkeys
2 parents 3703d8d + b8ef505 commit f72116f

5 files changed

Lines changed: 153 additions & 18 deletions

File tree

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bundle/manifests/argoproj.io_argocds.yaml‎

Lines changed: 75 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5480,14 +5480,88 @@ spec:
54805480
description: RepositoryCredentials are the Git pull credentials to
54815481
configure Argo CD with upon creation of the cluster.
54825482
type: string
5483+
resourceActions:
5484+
description: ResourceActions customizes resource action behavior.
5485+
items:
5486+
description: Resource Customization for custom action
5487+
properties:
5488+
action:
5489+
type: string
5490+
group:
5491+
type: string
5492+
kind:
5493+
type: string
5494+
type: object
5495+
type: array
54835496
resourceCustomizations:
54845497
description: 'ResourceCustomizations customizes resource behavior.
5485-
Keys are in the form: group/Kind.'
5498+
Keys are in the form: group/Kind. Please note that this is being
5499+
deprecated in favor of ResourceHealthChecks, ResourceIgnoreDifferences,
5500+
and ResourceActions.'
54865501
type: string
54875502
resourceExclusions:
54885503
description: ResourceExclusions is used to completely ignore entire
54895504
classes of resource group/kinds.
54905505
type: string
5506+
resourceHealthChecks:
5507+
description: ResourceHealthChecks customizes resource health check
5508+
behavior.
5509+
items:
5510+
description: Resource Customization for custom health check
5511+
properties:
5512+
check:
5513+
type: string
5514+
group:
5515+
type: string
5516+
kind:
5517+
type: string
5518+
type: object
5519+
type: array
5520+
resourceIgnoreDifferences:
5521+
description: ResourceIgnoreDifferences customizes resource ignore
5522+
difference behavior.
5523+
properties:
5524+
all:
5525+
properties:
5526+
jqPathExpressions:
5527+
items:
5528+
type: string
5529+
type: array
5530+
jsonPointers:
5531+
items:
5532+
type: string
5533+
type: array
5534+
managedFieldsManagers:
5535+
items:
5536+
type: string
5537+
type: array
5538+
type: object
5539+
resourceIdentifiers:
5540+
items:
5541+
description: Resource Customization fields for ignore difference
5542+
properties:
5543+
customization:
5544+
properties:
5545+
jqPathExpressions:
5546+
items:
5547+
type: string
5548+
type: array
5549+
jsonPointers:
5550+
items:
5551+
type: string
5552+
type: array
5553+
managedFieldsManagers:
5554+
items:
5555+
type: string
5556+
type: array
5557+
type: object
5558+
group:
5559+
type: string
5560+
kind:
5561+
type: string
5562+
type: object
5563+
type: array
5564+
type: object
54915565
resourceInclusions:
54925566
description: ResourceInclusions is used to only include specific group/kinds
54935567
in the reconciliation process.
@@ -5926,12 +6000,6 @@ spec:
59266000
- type
59276001
type: object
59286002
type: object
5929-
sourceNamespaces:
5930-
description: SourceNamespaces defines the namespaces application resources
5931-
are allowed to be created in
5932-
items:
5933-
type: string
5934-
type: array
59356003
sso:
59366004
description: SSO defines the Single Sign-on configuration for Argo
59376005
CD

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

Lines changed: 75 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5482,14 +5482,88 @@ spec:
54825482
description: RepositoryCredentials are the Git pull credentials to
54835483
configure Argo CD with upon creation of the cluster.
54845484
type: string
5485+
resourceActions:
5486+
description: ResourceActions customizes resource action behavior.
5487+
items:
5488+
description: Resource Customization for custom action
5489+
properties:
5490+
action:
5491+
type: string
5492+
group:
5493+
type: string
5494+
kind:
5495+
type: string
5496+
type: object
5497+
type: array
54855498
resourceCustomizations:
54865499
description: 'ResourceCustomizations customizes resource behavior.
5487-
Keys are in the form: group/Kind.'
5500+
Keys are in the form: group/Kind. Please note that this is being
5501+
deprecated in favor of ResourceHealthChecks, ResourceIgnoreDifferences,
5502+
and ResourceActions.'
54885503
type: string
54895504
resourceExclusions:
54905505
description: ResourceExclusions is used to completely ignore entire
54915506
classes of resource group/kinds.
54925507
type: string
5508+
resourceHealthChecks:
5509+
description: ResourceHealthChecks customizes resource health check
5510+
behavior.
5511+
items:
5512+
description: Resource Customization for custom health check
5513+
properties:
5514+
check:
5515+
type: string
5516+
group:
5517+
type: string
5518+
kind:
5519+
type: string
5520+
type: object
5521+
type: array
5522+
resourceIgnoreDifferences:
5523+
description: ResourceIgnoreDifferences customizes resource ignore
5524+
difference behavior.
5525+
properties:
5526+
all:
5527+
properties:
5528+
jqPathExpressions:
5529+
items:
5530+
type: string
5531+
type: array
5532+
jsonPointers:
5533+
items:
5534+
type: string
5535+
type: array
5536+
managedFieldsManagers:
5537+
items:
5538+
type: string
5539+
type: array
5540+
type: object
5541+
resourceIdentifiers:
5542+
items:
5543+
description: Resource Customization fields for ignore difference
5544+
properties:
5545+
customization:
5546+
properties:
5547+
jqPathExpressions:
5548+
items:
5549+
type: string
5550+
type: array
5551+
jsonPointers:
5552+
items:
5553+
type: string
5554+
type: array
5555+
managedFieldsManagers:
5556+
items:
5557+
type: string
5558+
type: array
5559+
type: object
5560+
group:
5561+
type: string
5562+
kind:
5563+
type: string
5564+
type: object
5565+
type: array
5566+
type: object
54935567
resourceInclusions:
54945568
description: ResourceInclusions is used to only include specific group/kinds
54955569
in the reconciliation process.
@@ -5928,12 +6002,6 @@ spec:
59286002
- type
59296003
type: object
59306004
type: object
5931-
sourceNamespaces:
5932-
description: SourceNamespaces defines the namespaces application resources
5933-
are allowed to be created in
5934-
items:
5935-
type: string
5936-
type: array
59376005
sso:
59386006
description: SSO defines the Single Sign-on configuration for Argo
59396007
CD

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
33
go 1.18
44

55
require (
6-
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221121214014-e0b755525224
6+
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221123150618-98abcf634fd3
77
github.com/coreos/prometheus-operator v0.40.0
88
github.com/go-logr/logr v1.2.3
99
github.com/google/go-cmp v0.5.8

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.m
147147
github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
148148
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
149149
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
150-
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221121214014-e0b755525224 h1:3AJoSM3gZp54x5tLsQQ5C+xhxWhsWX/X15M4EvJ9b38=
151-
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221121214014-e0b755525224/go.mod h1:4uHOPh2+gCJD3NGPViJOj87tIIOnmHZ97I0njkL5qRU=
150+
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221123150618-98abcf634fd3 h1:B67EYIft0vr6FgTUm0JVVsgpGNF9tjbvydZHcb+dCmw=
151+
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221123150618-98abcf634fd3/go.mod h1:4uHOPh2+gCJD3NGPViJOj87tIIOnmHZ97I0njkL5qRU=
152152
github.com/argoproj/argo-cd/v2 v2.5.2 h1:hyPi8NFXW3tG2yURslIMI20GfCdTN1/BDnt4+v5lpoA=
153153
github.com/argoproj/argo-cd/v2 v2.5.2/go.mod h1:3ToENm286PFVlZKNMutBzOwNyhevz4fw9dcgyiq3FIY=
154154
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=

0 commit comments

Comments
 (0)