Skip to content

Commit df202ac

Browse files
jgwestjgwest
authored
Update to argocd-operator 'cc67ce184e7e3350ac99a05418f066328830bcbf' (#720)
Signed-off-by: Jonathan West <jonwest@redhat.com>
1 parent 03612ed commit df202ac

11 files changed

Lines changed: 140 additions & 87 deletions

‎bundle/manifests/argoproj.io_applicationsets.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2371,8 +2371,6 @@ spec:
23712371
- metadata
23722372
- spec
23732373
type: object
2374-
required:
2375-
- elements
23762374
type: object
23772375
matrix:
23782376
properties:
@@ -4715,8 +4713,6 @@ spec:
47154713
- metadata
47164714
- spec
47174715
type: object
4718-
required:
4719-
- elements
47204716
type: object
47214717
matrix:
47224718
x-kubernetes-preserve-unknown-fields: true
@@ -9742,8 +9738,6 @@ spec:
97429738
- metadata
97439739
- spec
97449740
type: object
9745-
required:
9746-
- elements
97479741
type: object
97489742
matrix:
97499743
x-kubernetes-preserve-unknown-fields: true

‎bundle/manifests/argoproj.io_argocds.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,10 @@ spec:
630630
type: integer
631631
type: object
632632
type: object
633+
defaultClusterScopedRoleDisabled:
634+
description: DefaultClusterScopedRoleDisabled will disable creation
635+
of default ClusterRoles for a cluster scoped instance.
636+
type: boolean
633637
dex:
634638
description: Deprecated field. Support dropped in v1beta1 version.
635639
Dex defines the Dex server options for ArgoCD.
@@ -1059,6 +1063,10 @@ spec:
10591063
description: Monitoring defines whether workload status monitoring
10601064
configuration for this instance.
10611065
properties:
1066+
disableMetrics:
1067+
description: DisableMetrics field can be used to enable or disable
1068+
the collection of Metrics on Openshift
1069+
type: boolean
10621070
enabled:
10631071
description: Enabled defines whether workload status monitoring
10641072
is enabled for this instance or not
@@ -6693,6 +6701,10 @@ spec:
66936701
description: Keycloak contains the configuration for Argo CD keycloak
66946702
authentication
66956703
properties:
6704+
host:
6705+
description: Host is the hostname to use for Ingress/Route
6706+
resources.
6707+
type: string
66966708
image:
66976709
description: Image is the Keycloak container image.
66986710
type: string
@@ -7589,6 +7601,10 @@ spec:
75897601
type: integer
75907602
type: object
75917603
type: object
7604+
defaultClusterScopedRoleDisabled:
7605+
description: DefaultClusterScopedRoleDisabled will disable creation
7606+
of default ClusterRoles for a cluster scoped instance.
7607+
type: boolean
75927608
disableAdmin:
75937609
description: DisableAdmin will disable the admin user.
75947610
type: boolean
@@ -7944,6 +7960,10 @@ spec:
79447960
description: Monitoring defines whether workload status monitoring
79457961
configuration for this instance.
79467962
properties:
7963+
disableMetrics:
7964+
description: DisableMetrics field can be used to enable or disable
7965+
the collection of Metrics on Openshift
7966+
type: boolean
79477967
enabled:
79487968
description: Enabled defines whether workload status monitoring
79497969
is enabled for this instance or not
@@ -13704,6 +13724,10 @@ spec:
1370413724
description: Keycloak contains the configuration for Argo CD keycloak
1370513725
authentication
1370613726
properties:
13727+
host:
13728+
description: Host is the hostname to use for Ingress/Route
13729+
resources.
13730+
type: string
1370713731
image:
1370813732
description: Image is the Keycloak container image.
1370913733
type: string

‎bundle/manifests/argoproj.io_notificationsconfigurations.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ spec:
3636
description: NotificationsConfigurationSpec allows users to define the
3737
triggers, templates, services, context and subscriptions for the notifications
3838
properties:
39+
context:
40+
additionalProperties:
41+
type: string
42+
description: Context is used to define some shared context between
43+
all notification templates
44+
type: object
3945
services:
4046
additionalProperties:
4147
type: string

‎bundle/manifests/pipelines.openshift.io_gitopsservices.yaml‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.4.1
66
creationTimestamp: null
77
name: gitopsservices.pipelines.openshift.io
88
spec:
@@ -20,19 +20,14 @@ spec:
2020
description: GitopsService is the Schema for the gitopsservices API
2121
properties:
2222
apiVersion:
23-
description: |-
24-
APIVersion defines the versioned schema of this representation of an object.
25-
Servers should convert recognized schemas to the latest internal value, and
26-
may reject unrecognized values.
27-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
23+
description: 'APIVersion defines the versioned schema of this representation
24+
of an object. Servers should convert recognized schemas to the latest
25+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2826
type: string
2927
kind:
30-
description: |-
31-
Kind is a string value representing the REST resource this object represents.
32-
Servers may infer this from the endpoint the client submits requests to.
33-
Cannot be updated.
34-
In CamelCase.
35-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
28+
description: 'Kind is a string value representing the REST resource this
29+
object represents. Servers may infer this from the endpoint the client
30+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
3631
type: string
3732
metadata:
3833
type: object
@@ -53,39 +48,40 @@ spec:
5348
description: Tolerations allow the default workloads to schedule onto
5449
nodes with matching taints
5550
items:
56-
description: |-
57-
The pod this Toleration is attached to tolerates any taint that matches
58-
the triple <key,value,effect> using the matching operator <operator>.
51+
description: The pod this Toleration is attached to tolerates any
52+
taint that matches the triple <key,value,effect> using the matching
53+
operator <operator>.
5954
properties:
6055
effect:
61-
description: |-
62-
Effect indicates the taint effect to match. Empty means match all taint effects.
63-
When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
56+
description: Effect indicates the taint effect to match. Empty
57+
means match all taint effects. When specified, allowed values
58+
are NoSchedule, PreferNoSchedule and NoExecute.
6459
type: string
6560
key:
66-
description: |-
67-
Key is the taint key that the toleration applies to. Empty means match all taint keys.
68-
If the key is empty, operator must be Exists; this combination means to match all values and all keys.
61+
description: Key is the taint key that the toleration applies
62+
to. Empty means match all taint keys. If the key is empty,
63+
operator must be Exists; this combination means to match all
64+
values and all keys.
6965
type: string
7066
operator:
71-
description: |-
72-
Operator represents a key's relationship to the value.
73-
Valid operators are Exists and Equal. Defaults to Equal.
74-
Exists is equivalent to wildcard for value, so that a pod can
75-
tolerate all taints of a particular category.
67+
description: Operator represents a key's relationship to the
68+
value. Valid operators are Exists and Equal. Defaults to Equal.
69+
Exists is equivalent to wildcard for value, so that a pod
70+
can tolerate all taints of a particular category.
7671
type: string
7772
tolerationSeconds:
78-
description: |-
79-
TolerationSeconds represents the period of time the toleration (which must be
80-
of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
81-
it is not set, which means tolerate the taint forever (do not evict). Zero and
82-
negative values will be treated as 0 (evict immediately) by the system.
73+
description: TolerationSeconds represents the period of time
74+
the toleration (which must be of effect NoExecute, otherwise
75+
this field is ignored) tolerates the taint. By default, it
76+
is not set, which means tolerate the taint forever (do not
77+
evict). Zero and negative values will be treated as 0 (evict
78+
immediately) by the system.
8379
format: int64
8480
type: integer
8581
value:
86-
description: |-
87-
Value is the taint value the toleration matches to.
88-
If the operator is Exists, the value should be empty, otherwise just a regular string.
82+
description: Value is the taint value the toleration matches
83+
to. If the operator is Exists, the value should be empty,
84+
otherwise just a regular string.
8985
type: string
9086
type: object
9187
type: array
@@ -102,5 +98,5 @@ status:
10298
acceptedNames:
10399
kind: ""
104100
plural: ""
105-
conditions: null
106-
storedVersions: null
101+
conditions: []
102+
storedVersions: []

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2370,8 +2370,6 @@ spec:
23702370
- metadata
23712371
- spec
23722372
type: object
2373-
required:
2374-
- elements
23752373
type: object
23762374
matrix:
23772375
properties:
@@ -4714,8 +4712,6 @@ spec:
47144712
- metadata
47154713
- spec
47164714
type: object
4717-
required:
4718-
- elements
47194715
type: object
47204716
matrix:
47214717
x-kubernetes-preserve-unknown-fields: true
@@ -9741,8 +9737,6 @@ spec:
97419737
- metadata
97429738
- spec
97439739
type: object
9744-
required:
9745-
- elements
97469740
type: object
97479741
matrix:
97489742
x-kubernetes-preserve-unknown-fields: true

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,10 @@ spec:
621621
type: integer
622622
type: object
623623
type: object
624+
defaultClusterScopedRoleDisabled:
625+
description: DefaultClusterScopedRoleDisabled will disable creation
626+
of default ClusterRoles for a cluster scoped instance.
627+
type: boolean
624628
dex:
625629
description: Deprecated field. Support dropped in v1beta1 version.
626630
Dex defines the Dex server options for ArgoCD.
@@ -1050,6 +1054,10 @@ spec:
10501054
description: Monitoring defines whether workload status monitoring
10511055
configuration for this instance.
10521056
properties:
1057+
disableMetrics:
1058+
description: DisableMetrics field can be used to enable or disable
1059+
the collection of Metrics on Openshift
1060+
type: boolean
10531061
enabled:
10541062
description: Enabled defines whether workload status monitoring
10551063
is enabled for this instance or not
@@ -6684,6 +6692,10 @@ spec:
66846692
description: Keycloak contains the configuration for Argo CD keycloak
66856693
authentication
66866694
properties:
6695+
host:
6696+
description: Host is the hostname to use for Ingress/Route
6697+
resources.
6698+
type: string
66876699
image:
66886700
description: Image is the Keycloak container image.
66896701
type: string
@@ -7580,6 +7592,10 @@ spec:
75807592
type: integer
75817593
type: object
75827594
type: object
7595+
defaultClusterScopedRoleDisabled:
7596+
description: DefaultClusterScopedRoleDisabled will disable creation
7597+
of default ClusterRoles for a cluster scoped instance.
7598+
type: boolean
75837599
disableAdmin:
75847600
description: DisableAdmin will disable the admin user.
75857601
type: boolean
@@ -7935,6 +7951,10 @@ spec:
79357951
description: Monitoring defines whether workload status monitoring
79367952
configuration for this instance.
79377953
properties:
7954+
disableMetrics:
7955+
description: DisableMetrics field can be used to enable or disable
7956+
the collection of Metrics on Openshift
7957+
type: boolean
79387958
enabled:
79397959
description: Enabled defines whether workload status monitoring
79407960
is enabled for this instance or not
@@ -13695,6 +13715,10 @@ spec:
1369513715
description: Keycloak contains the configuration for Argo CD keycloak
1369613716
authentication
1369713717
properties:
13718+
host:
13719+
description: Host is the hostname to use for Ingress/Route
13720+
resources.
13721+
type: string
1369813722
image:
1369913723
description: Image is the Keycloak container image.
1370013724
type: string
@@ -13911,4 +13935,4 @@ status:
1391113935
kind: ""
1391213936
plural: ""
1391313937
conditions: []
13914-
storedVersions: []
13938+
storedVersions: []

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2+
---
13
apiVersion: apiextensions.k8s.io/v1
24
kind: CustomResourceDefinition
35
metadata:
@@ -36,6 +38,12 @@ spec:
3638
description: NotificationsConfigurationSpec allows users to define the
3739
triggers, templates, services, context and subscriptions for the notifications
3840
properties:
41+
context:
42+
additionalProperties:
43+
type: string
44+
description: Context is used to define some shared context between
45+
all notification templates
46+
type: object
3947
services:
4048
additionalProperties:
4149
type: string
@@ -72,4 +80,4 @@ status:
7280
kind: ""
7381
plural: ""
7482
conditions: []
75-
storedVersions: []
83+
storedVersions: []

0 commit comments

Comments
 (0)