Skip to content

chore: pick up latest commit and update CRDs for resource customization subkeys #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaideepr97 merged 2 commits into from
Nov 23, 2022
Merged

chore: pick up latest commit and update CRDs for resource customization subkeys #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ae48f0
update CRD for resource customizations
jaideepr97 Nov 23, 2022
b8ef505
consume resource customization from release-0.5
jaideepr97 Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 75 additions & 7 deletions bundle/manifests/argoproj.io_argocds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5480,14 +5480,88 @@ spec:
description: RepositoryCredentials are the Git pull credentials to
configure Argo CD with upon creation of the cluster.
type: string
resourceActions:
description: ResourceActions customizes resource action behavior.
items:
description: Resource Customization for custom action
properties:
action:
type: string
group:
type: string
kind:
type: string
type: object
type: array
resourceCustomizations:
description: 'ResourceCustomizations customizes resource behavior.
Keys are in the form: group/Kind.'
Keys are in the form: group/Kind. Please note that this is being
deprecated in favor of ResourceHealthChecks, ResourceIgnoreDifferences,
and ResourceActions.'
type: string
resourceExclusions:
description: ResourceExclusions is used to completely ignore entire
classes of resource group/kinds.
type: string
resourceHealthChecks:
description: ResourceHealthChecks customizes resource health check
behavior.
items:
description: Resource Customization for custom health check
properties:
check:
type: string
group:
type: string
kind:
type: string
type: object
type: array
resourceIgnoreDifferences:
description: ResourceIgnoreDifferences customizes resource ignore
difference behavior.
properties:
all:
properties:
jqPathExpressions:
items:
type: string
type: array
jsonPointers:
items:
type: string
type: array
managedFieldsManagers:
items:
type: string
type: array
type: object
resourceIdentifiers:
items:
description: Resource Customization fields for ignore difference
properties:
customization:
properties:
jqPathExpressions:
items:
type: string
type: array
jsonPointers:
items:
type: string
type: array
managedFieldsManagers:
items:
type: string
type: array
type: object
group:
type: string
kind:
type: string
type: object
type: array
type: object
resourceInclusions:
description: ResourceInclusions is used to only include specific group/kinds
in the reconciliation process.
Expand Down Expand Up @@ -5926,12 +6000,6 @@ spec:
- type
type: object
type: object
sourceNamespaces:
description: SourceNamespaces defines the namespaces application resources
are allowed to be created in
items:
type: string
type: array
sso:
description: SSO defines the Single Sign-on configuration for Argo
CD
Expand Down
82 changes: 75 additions & 7 deletions config/crd/bases/argoproj.io_argocds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5482,14 +5482,88 @@ spec:
description: RepositoryCredentials are the Git pull credentials to
configure Argo CD with upon creation of the cluster.
type: string
resourceActions:
description: ResourceActions customizes resource action behavior.
items:
description: Resource Customization for custom action
properties:
action:
type: string
group:
type: string
kind:
type: string
type: object
type: array
resourceCustomizations:
description: 'ResourceCustomizations customizes resource behavior.
Keys are in the form: group/Kind.'
Keys are in the form: group/Kind. Please note that this is being
deprecated in favor of ResourceHealthChecks, ResourceIgnoreDifferences,
and ResourceActions.'
type: string
resourceExclusions:
description: ResourceExclusions is used to completely ignore entire
classes of resource group/kinds.
type: string
resourceHealthChecks:
description: ResourceHealthChecks customizes resource health check
behavior.
items:
description: Resource Customization for custom health check
properties:
check:
type: string
group:
type: string
kind:
type: string
type: object
type: array
resourceIgnoreDifferences:
description: ResourceIgnoreDifferences customizes resource ignore
difference behavior.
properties:
all:
properties:
jqPathExpressions:
items:
type: string
type: array
jsonPointers:
items:
type: string
type: array
managedFieldsManagers:
items:
type: string
type: array
type: object
resourceIdentifiers:
items:
description: Resource Customization fields for ignore difference
properties:
customization:
properties:
jqPathExpressions:
items:
type: string
type: array
jsonPointers:
items:
type: string
type: array
managedFieldsManagers:
items:
type: string
type: array
type: object
group:
type: string
kind:
type: string
type: object
type: array
type: object
resourceInclusions:
description: ResourceInclusions is used to only include specific group/kinds
in the reconciliation process.
Expand Down Expand Up @@ -5928,12 +6002,6 @@ spec:
- type
type: object
type: object
sourceNamespaces:
description: SourceNamespaces defines the namespaces application resources
are allowed to be created in
items:
type: string
type: array
sso:
description: SSO defines the Single Sign-on configuration for Argo
CD
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
go 1.18

require (
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221121214014-e0b755525224
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221123150618-98abcf634fd3
github.com/coreos/prometheus-operator v0.40.0
github.com/go-logr/logr v1.2.3
github.com/google/go-cmp v0.5.8
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.m
github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221121214014-e0b755525224 h1:3AJoSM3gZp54x5tLsQQ5C+xhxWhsWX/X15M4EvJ9b38=
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221121214014-e0b755525224/go.mod h1:4uHOPh2+gCJD3NGPViJOj87tIIOnmHZ97I0njkL5qRU=
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221123150618-98abcf634fd3 h1:B67EYIft0vr6FgTUm0JVVsgpGNF9tjbvydZHcb+dCmw=
github.com/argoproj-labs/argocd-operator v0.0.16-0.20221123150618-98abcf634fd3/go.mod h1:4uHOPh2+gCJD3NGPViJOj87tIIOnmHZ97I0njkL5qRU=
github.com/argoproj/argo-cd/v2 v2.5.2 h1:hyPi8NFXW3tG2yURslIMI20GfCdTN1/BDnt4+v5lpoA=
github.com/argoproj/argo-cd/v2 v2.5.2/go.mod h1:3ToENm286PFVlZKNMutBzOwNyhevz4fw9dcgyiq3FIY=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
Expand Down