diff --git a/bundle/manifests/argoproj.io_applications.yaml b/bundle/manifests/argoproj.io_applications.yaml index 300c6fdddc7..a00f7eae943 100644 --- a/bundle/manifests/argoproj.io_applications.yaml +++ b/bundle/manifests/argoproj.io_applications.yaml @@ -411,12 +411,12 @@ spec: apply common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in the + kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in the + kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -800,12 +800,12 @@ spec: to apply common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -1299,11 +1299,11 @@ spec: common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources + description: NamePrefix overrides the namePrefix in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources + description: NameSuffix overrides the nameSuffix in the kustomization.yaml for Kustomize apps type: string namespace: @@ -1676,12 +1676,12 @@ spec: apply common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in the + kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in the + kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -2087,12 +2087,12 @@ spec: common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in the + kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in the + kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -2646,12 +2646,12 @@ spec: to apply common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -3039,12 +3039,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -3191,6 +3191,7 @@ spec: observedAt: description: |- ObservedAt indicates when the application state was updated without querying latest git state + Deprecated: controller no longer updates ObservedAt field format: date-time type: string @@ -3587,12 +3588,12 @@ spec: or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that @@ -4000,12 +4001,12 @@ spec: selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended - to resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended - to resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that @@ -4530,12 +4531,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -4934,12 +4935,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -5459,12 +5460,12 @@ spec: or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that @@ -5912,12 +5913,12 @@ spec: or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that @@ -6425,12 +6426,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -6829,12 +6830,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize diff --git a/bundle/manifests/argoproj.io_applicationsets.yaml b/bundle/manifests/argoproj.io_applicationsets.yaml index 7342504075a..bc6e0dee947 100644 --- a/bundle/manifests/argoproj.io_applicationsets.yaml +++ b/bundle/manifests/argoproj.io_applicationsets.yaml @@ -23116,6 +23116,16 @@ spec: - type type: object type: array + health: + properties: + lastTransitionTime: + format: date-time + type: string + message: + type: string + status: + type: string + type: object resources: items: properties: diff --git a/bundle/manifests/argoproj.io_argocds.yaml b/bundle/manifests/argoproj.io_argocds.yaml index 4980e27b7e9..da1cf638ff0 100644 --- a/bundle/manifests/argoproj.io_argocds.yaml +++ b/bundle/manifests/argoproj.io_argocds.yaml @@ -699,6 +699,21 @@ spec: description: LogLevel refers to the log level used by the Agent component. type: string + metrics: + description: Metrics defines the metrics configuration for + the Agent ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object redis: description: Redis defines the Redis options for the Agent component. @@ -922,6 +937,21 @@ spec: description: LogLevel refers to the log level used by the Principal component. type: string + metrics: + description: Metrics defines the metrics configuration for + the Principal ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object namespace: description: Namespace is the configuration for the Principal component namespace. @@ -1242,6 +1272,21 @@ spec: Controller component. Defaults to ArgoCDDefaultLogLevel if not configured. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Application Controller ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object parallelismLimit: description: ParallelismLimit defines the limit for parallel kubectl operations @@ -1325,6 +1370,15 @@ spec: description: Sharding contains the options for the Application Controller sharding configuration. properties: + algorithm: + description: DistributionAlgorithm determines what algorithm + will be used for distribution of shards. Valid options are + legacy, round-robin, and consistent-hashing + enum: + - legacy + - round-robin + - consistent-hashing + type: string clustersPerShard: description: ClustersPerShard defines the maximum number of clusters managed by each argocd shard @@ -1905,7 +1959,6 @@ spec: NetworkPolicy resources for this Argo CD instance. properties: enabled: - default: true description: |- Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance. When enabled, the operator will reconcile NetworkPolicies for Argo CD components. @@ -2133,12 +2186,7 @@ spec: image: description: Image is the Argo CD Notifications image (optional) type: string - logLevel: - description: LogLevel describes the log level that should be used - by the argocd-notifications. Defaults to ArgoCDDefaultLogLevel - if not set. Valid options are debug,info, error, and warn. - type: string - logformat: + logFormat: description: LogFormat refers to the log format used by the argocd-notifications. Defaults to ArgoCDDefaultLogFormat if not configured. Valid options are text or json. @@ -2146,6 +2194,29 @@ spec: - text - json type: string + logLevel: + description: LogLevel describes the log level that should be used + by the argocd-notifications. Defaults to ArgoCDDefaultLogLevel + if not set. Valid options are debug,info, error, and warn. + type: string + logformat: + description: 'Deprecated: use LogFormat instead.' + type: string + metrics: + description: Metrics defines the metrics configuration for the + Notifications ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object replicas: description: Replicas defines the number of replicas to run for notifications-controller @@ -4247,6 +4318,21 @@ spec: by the Repo Server. Defaults to ArgoCDDefaultLogLevel if not set. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Repo Server ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object mountsatoken: description: MountSAToken describes whether you would like to have the Repo server mount the service account token @@ -8278,6 +8364,21 @@ spec: ArgoCD Server component. Defaults to ArgoCDDefaultLogLevel if not set. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Server ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object replicas: description: Replicas defines the number of replicas for argocd-server. Default is nil. Value should be greater than or equal to 0. @@ -8755,6 +8856,145 @@ spec: description: Version is the tag to use with the ArgoCD container image for all ArgoCD components. type: string + webhookSecrets: + description: |- + WebhookSecrets references Kubernetes Secrets that supply webhook credentials per provider. + The operator syncs values into argocd-secret under the keys Argo CD expects. + properties: + azureDevOps: + description: 'AzureDevOps: Secret key references for the Azure + DevOps webhook username and password (or PAT).' + properties: + passwordSecretRef: + description: PasswordSecretRef points to the key holding the + password or PAT. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + usernameSecretRef: + description: UsernameSecretRef points to the key holding the + username. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + x-kubernetes-validations: + - message: usernameSecretRef and passwordSecretRef must be set + together + rule: (has(self.usernameSecretRef) && has(self.passwordSecretRef)) + || (!has(self.usernameSecretRef) && !has(self.passwordSecretRef)) + bitbucket: + description: 'Bitbucket: Secret key reference for the Bitbucket + Cloud webhook UUID.' + properties: + webhookUUIDSecretRef: + description: WebhookUUIDSecretRef points to the key holding + the Bitbucket Cloud webhook UUID. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + bitbucketServer: + description: 'BitbucketServer: Secret key reference for the Bitbucket + Server webhook secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + Bitbucket Server webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + github: + description: 'GitHub: Secret key reference for the GitHub webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + GitHub webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + gitlab: + description: 'GitLab: Secret key reference for the GitLab webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + GitLab webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + gogs: + description: 'Gogs: Secret key reference for the Gogs webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + Gogs webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + type: object type: object status: description: ArgoCDStatus defines the observed state of ArgoCD @@ -9129,12 +9369,7 @@ spec: type: string description: Custom labels to pods deployed by the operator type: object - logLevel: - description: LogLevel describes the log level that should be used - by the ApplicationSet controller. Defaults to ArgoCDDefaultLogLevel - if not set. Valid options are debug,info, error, and warn. - type: string - logformat: + logFormat: description: LogFormat refers to the log format used by the ApplicationSet component. Defaults to ArgoCDDefaultLogFormat if not configured. Valid options are text or json. @@ -9142,6 +9377,14 @@ spec: - text - json type: string + logLevel: + description: LogLevel describes the log level that should be used + by the ApplicationSet controller. Defaults to ArgoCDDefaultLogLevel + if not set. Valid options are debug,info, error, and warn. + type: string + logformat: + description: 'Deprecated: use LogFormat instead.' + type: string resources: description: Resources defines the Compute Resources required by the container for ApplicationSet. @@ -11586,6 +11829,21 @@ spec: description: LogLevel refers to the log level used by the Agent component. type: string + metrics: + description: Metrics defines the metrics configuration for + the Agent ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object redis: description: Redis defines the Redis options for the Agent component. @@ -11595,6 +11853,66 @@ spec: server to be used by the PrincAgentipal component. type: string type: object + resources: + description: Resources defines the Compute Resources required + by the container for the Argo CD Agent agent component. + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This field depends on the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object tls: description: TLS defines the TLS options for the Agent component. properties: @@ -11813,6 +12131,21 @@ spec: description: LogLevel refers to the log level used by the Principal component. type: string + metrics: + description: Metrics defines the metrics configuration for + the Principal ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object namespace: description: Namespace is the configuration for the Principal component namespace. @@ -11865,6 +12198,66 @@ spec: the TLS certificate and key for the resource proxy. type: string type: object + resources: + description: Resources defines the Compute Resources required + by the container for the Argo CD Agent principal component. + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This field depends on the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object server: description: Server defines the server options for the Principal component. @@ -11945,11 +12338,20 @@ spec: required: - content type: object + clusterDomain: + description: |- + ClusterDomain is the cluster domain suffix used for constructing service FQDNs. Defaults to "cluster.local". + The full FQDN will be: ..svc. + This is useful for clusters that use a different DNS suffix (e.g., "CLUSTER_ID.cluster.local", "edge.local"). + type: string cmdParams: additionalProperties: type: string - description: CmdParams specifies command-line parameters for the Argo - CD components. + description: |- + CmdParams specifies command-line parameters for the Argo CD components. + The only keys currently supported for this parameter are: + - controller.resource.health.persist + - applicationsetcontroller.enable.tokenref.strict.mode — when ApplicationSet-in-any-namespace is active, the operator defaults this to "true" type: object configManagementPlugins: description: 'Deprecated: ConfigManagementPlugins field is no longer @@ -13692,6 +14094,21 @@ spec: Controller component. Defaults to ArgoCDDefaultLogLevel if not configured. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Application Controller ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object parallelismLimit: description: ParallelismLimit defines the limit for parallel kubectl operations @@ -13780,6 +14197,15 @@ spec: description: Sharding contains the options for the Application Controller sharding configuration. properties: + algorithm: + description: DistributionAlgorithm determines what algorithm + will be used for distribution of shards. Valid options are + legacy, round-robin, and consistent-hashing + enum: + - legacy + - round-robin + - consistent-hashing + type: string clustersPerShard: description: ClustersPerShard defines the maximum number of clusters managed by each argocd shard @@ -18031,7 +18457,6 @@ spec: NetworkPolicy resources for this Argo CD instance. properties: enabled: - default: true description: |- Enabled defines whether NetworkPolicy resources are created for this Argo CD instance. When enabled, the operator will reconcile NetworkPolicies for Argo CD components. @@ -18259,12 +18684,7 @@ spec: image: description: Image is the Argo CD Notifications image (optional) type: string - logLevel: - description: LogLevel describes the log level that should be used - by the argocd-notifications. Defaults to ArgoCDDefaultLogLevel - if not set. Valid options are debug,info, error, and warn. - type: string - logformat: + logFormat: description: LogFormat refers to the log format used by the argocd-notifications. Defaults to ArgoCDDefaultLogFormat if not configured. Valid options are text or json. @@ -18272,6 +18692,29 @@ spec: - text - json type: string + logLevel: + description: LogLevel describes the log level that should be used + by the argocd-notifications. Defaults to ArgoCDDefaultLogLevel + if not set. Valid options are debug,info, error, and warn. + type: string + logformat: + description: 'Deprecated: use LogFormat instead.' + type: string + metrics: + description: Metrics defines the metrics configuration for the + Notifications ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object replicas: description: Replicas defines the number of replicas to run for notifications-controller @@ -20396,6 +20839,21 @@ spec: by the Repo Server. Defaults to ArgoCDDefaultLogLevel if not set. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Repo Server ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object mountsatoken: description: MountSAToken describes whether you would like to have the Repo server mount the service account token @@ -26203,6 +26661,21 @@ spec: ArgoCD Server component. Defaults to ArgoCDDefaultLogLevel if not set. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Server ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object replicas: description: Replicas defines the number of replicas for argocd-server. Default is nil. Value should be greater than or equal to 0. @@ -32216,6 +32689,149 @@ spec: description: Version is the tag to use with the ArgoCD container image for all ArgoCD components. type: string + webTerminalEnabled: + description: WebTerminalEnabled allows you to get a shell inside a + running pod just like you would with kubectl exec + type: boolean + webhookSecrets: + description: |- + WebhookSecrets references Kubernetes Secrets that supply webhook credentials per provider. + The operator syncs values into argocd-secret under the keys Argo CD expects. + properties: + azureDevOps: + description: 'AzureDevOps: Secret key references for the Azure + DevOps webhook username and password (or PAT).' + properties: + passwordSecretRef: + description: PasswordSecretRef points to the key holding the + password or PAT. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + usernameSecretRef: + description: UsernameSecretRef points to the key holding the + username. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + x-kubernetes-validations: + - message: usernameSecretRef and passwordSecretRef must be set + together + rule: (has(self.usernameSecretRef) && has(self.passwordSecretRef)) + || (!has(self.usernameSecretRef) && !has(self.passwordSecretRef)) + bitbucket: + description: 'Bitbucket: Secret key reference for the Bitbucket + Cloud webhook UUID.' + properties: + webhookUUIDSecretRef: + description: WebhookUUIDSecretRef points to the key holding + the Bitbucket Cloud webhook UUID. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + bitbucketServer: + description: 'BitbucketServer: Secret key reference for the Bitbucket + Server webhook secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + Bitbucket Server webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + github: + description: 'GitHub: Secret key reference for the GitHub webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + GitHub webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + gitlab: + description: 'GitLab: Secret key reference for the GitLab webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + GitLab webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + gogs: + description: 'Gogs: Secret key reference for the Gogs webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + Gogs webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + type: object type: object x-kubernetes-validations: - message: spec.sso and spec.oidcConfig cannot both be set diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index 429e28f0275..fef39a10f92 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -190,7 +190,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2026-06-11T15:05:37Z" + createdAt: "2026-06-12T08:52:50Z" description: Enables teams to adopt GitOps principles for managing cluster configurations and application delivery across hybrid multi-cluster Kubernetes environments. features.operators.openshift.io/disconnected: "true" diff --git a/config/crd/bases/argoproj.io_applications.yaml b/config/crd/bases/argoproj.io_applications.yaml index 022fb1d48b3..cb47657f75d 100644 --- a/config/crd/bases/argoproj.io_applications.yaml +++ b/config/crd/bases/argoproj.io_applications.yaml @@ -410,12 +410,12 @@ spec: apply common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in the + kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in the + kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -799,12 +799,12 @@ spec: to apply common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -1298,11 +1298,11 @@ spec: common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources + description: NamePrefix overrides the namePrefix in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources + description: NameSuffix overrides the nameSuffix in the kustomization.yaml for Kustomize apps type: string namespace: @@ -1675,12 +1675,12 @@ spec: apply common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in the + kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in the + kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -2086,12 +2086,12 @@ spec: common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in the + kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in the + kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -2645,12 +2645,12 @@ spec: to apply common labels to resource selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -3038,12 +3038,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -3190,6 +3190,7 @@ spec: observedAt: description: |- ObservedAt indicates when the application state was updated without querying latest git state + Deprecated: controller no longer updates ObservedAt field format: date-time type: string @@ -3586,12 +3587,12 @@ spec: or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that @@ -3999,12 +4000,12 @@ spec: selectors or not type: boolean namePrefix: - description: NamePrefix is a prefix appended - to resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended - to resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that @@ -4529,12 +4530,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -4933,12 +4934,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -5458,12 +5459,12 @@ spec: or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that @@ -5911,12 +5912,12 @@ spec: or not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that @@ -6424,12 +6425,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to resources - for Kustomize apps + description: NamePrefix overrides the namePrefix in + the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for Kustomize apps + description: NameSuffix overrides the nameSuffix in + the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize @@ -6828,12 +6829,12 @@ spec: not type: boolean namePrefix: - description: NamePrefix is a prefix appended to - resources for Kustomize apps + description: NamePrefix overrides the namePrefix + in the kustomization.yaml for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for Kustomize apps + description: NameSuffix overrides the nameSuffix + in the kustomization.yaml for Kustomize apps type: string namespace: description: Namespace sets the namespace that Kustomize diff --git a/config/crd/bases/argoproj.io_applicationsets.yaml b/config/crd/bases/argoproj.io_applicationsets.yaml index ad3fe3cac18..5932f99479d 100644 --- a/config/crd/bases/argoproj.io_applicationsets.yaml +++ b/config/crd/bases/argoproj.io_applicationsets.yaml @@ -23115,6 +23115,16 @@ spec: - type type: object type: array + health: + properties: + lastTransitionTime: + format: date-time + type: string + message: + type: string + status: + type: string + type: object resources: items: properties: diff --git a/config/crd/bases/argoproj.io_argocds.yaml b/config/crd/bases/argoproj.io_argocds.yaml index 56185f64d61..09c6829ba7d 100644 --- a/config/crd/bases/argoproj.io_argocds.yaml +++ b/config/crd/bases/argoproj.io_argocds.yaml @@ -688,6 +688,21 @@ spec: description: LogLevel refers to the log level used by the Agent component. type: string + metrics: + description: Metrics defines the metrics configuration for + the Agent ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object redis: description: Redis defines the Redis options for the Agent component. @@ -911,6 +926,21 @@ spec: description: LogLevel refers to the log level used by the Principal component. type: string + metrics: + description: Metrics defines the metrics configuration for + the Principal ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object namespace: description: Namespace is the configuration for the Principal component namespace. @@ -1231,6 +1261,21 @@ spec: Controller component. Defaults to ArgoCDDefaultLogLevel if not configured. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Application Controller ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object parallelismLimit: description: ParallelismLimit defines the limit for parallel kubectl operations @@ -1314,6 +1359,15 @@ spec: description: Sharding contains the options for the Application Controller sharding configuration. properties: + algorithm: + description: DistributionAlgorithm determines what algorithm + will be used for distribution of shards. Valid options are + legacy, round-robin, and consistent-hashing + enum: + - legacy + - round-robin + - consistent-hashing + type: string clustersPerShard: description: ClustersPerShard defines the maximum number of clusters managed by each argocd shard @@ -1894,7 +1948,6 @@ spec: NetworkPolicy resources for this Argo CD instance. properties: enabled: - default: true description: |- Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance. When enabled, the operator will reconcile NetworkPolicies for Argo CD components. @@ -2122,12 +2175,7 @@ spec: image: description: Image is the Argo CD Notifications image (optional) type: string - logLevel: - description: LogLevel describes the log level that should be used - by the argocd-notifications. Defaults to ArgoCDDefaultLogLevel - if not set. Valid options are debug,info, error, and warn. - type: string - logformat: + logFormat: description: LogFormat refers to the log format used by the argocd-notifications. Defaults to ArgoCDDefaultLogFormat if not configured. Valid options are text or json. @@ -2135,6 +2183,29 @@ spec: - text - json type: string + logLevel: + description: LogLevel describes the log level that should be used + by the argocd-notifications. Defaults to ArgoCDDefaultLogLevel + if not set. Valid options are debug,info, error, and warn. + type: string + logformat: + description: 'Deprecated: use LogFormat instead.' + type: string + metrics: + description: Metrics defines the metrics configuration for the + Notifications ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object replicas: description: Replicas defines the number of replicas to run for notifications-controller @@ -4236,6 +4307,21 @@ spec: by the Repo Server. Defaults to ArgoCDDefaultLogLevel if not set. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Repo Server ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object mountsatoken: description: MountSAToken describes whether you would like to have the Repo server mount the service account token @@ -8267,6 +8353,21 @@ spec: ArgoCD Server component. Defaults to ArgoCDDefaultLogLevel if not set. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Server ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object replicas: description: Replicas defines the number of replicas for argocd-server. Default is nil. Value should be greater than or equal to 0. @@ -8744,6 +8845,145 @@ spec: description: Version is the tag to use with the ArgoCD container image for all ArgoCD components. type: string + webhookSecrets: + description: |- + WebhookSecrets references Kubernetes Secrets that supply webhook credentials per provider. + The operator syncs values into argocd-secret under the keys Argo CD expects. + properties: + azureDevOps: + description: 'AzureDevOps: Secret key references for the Azure + DevOps webhook username and password (or PAT).' + properties: + passwordSecretRef: + description: PasswordSecretRef points to the key holding the + password or PAT. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + usernameSecretRef: + description: UsernameSecretRef points to the key holding the + username. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + x-kubernetes-validations: + - message: usernameSecretRef and passwordSecretRef must be set + together + rule: (has(self.usernameSecretRef) && has(self.passwordSecretRef)) + || (!has(self.usernameSecretRef) && !has(self.passwordSecretRef)) + bitbucket: + description: 'Bitbucket: Secret key reference for the Bitbucket + Cloud webhook UUID.' + properties: + webhookUUIDSecretRef: + description: WebhookUUIDSecretRef points to the key holding + the Bitbucket Cloud webhook UUID. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + bitbucketServer: + description: 'BitbucketServer: Secret key reference for the Bitbucket + Server webhook secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + Bitbucket Server webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + github: + description: 'GitHub: Secret key reference for the GitHub webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + GitHub webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + gitlab: + description: 'GitLab: Secret key reference for the GitLab webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + GitLab webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + gogs: + description: 'Gogs: Secret key reference for the Gogs webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + Gogs webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + type: object type: object status: description: ArgoCDStatus defines the observed state of ArgoCD @@ -9118,12 +9358,7 @@ spec: type: string description: Custom labels to pods deployed by the operator type: object - logLevel: - description: LogLevel describes the log level that should be used - by the ApplicationSet controller. Defaults to ArgoCDDefaultLogLevel - if not set. Valid options are debug,info, error, and warn. - type: string - logformat: + logFormat: description: LogFormat refers to the log format used by the ApplicationSet component. Defaults to ArgoCDDefaultLogFormat if not configured. Valid options are text or json. @@ -9131,6 +9366,14 @@ spec: - text - json type: string + logLevel: + description: LogLevel describes the log level that should be used + by the ApplicationSet controller. Defaults to ArgoCDDefaultLogLevel + if not set. Valid options are debug,info, error, and warn. + type: string + logformat: + description: 'Deprecated: use LogFormat instead.' + type: string resources: description: Resources defines the Compute Resources required by the container for ApplicationSet. @@ -11575,6 +11818,21 @@ spec: description: LogLevel refers to the log level used by the Agent component. type: string + metrics: + description: Metrics defines the metrics configuration for + the Agent ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object redis: description: Redis defines the Redis options for the Agent component. @@ -11584,6 +11842,66 @@ spec: server to be used by the PrincAgentipal component. type: string type: object + resources: + description: Resources defines the Compute Resources required + by the container for the Argo CD Agent agent component. + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This field depends on the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object tls: description: TLS defines the TLS options for the Agent component. properties: @@ -11802,6 +12120,21 @@ spec: description: LogLevel refers to the log level used by the Principal component. type: string + metrics: + description: Metrics defines the metrics configuration for + the Principal ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object namespace: description: Namespace is the configuration for the Principal component namespace. @@ -11854,6 +12187,66 @@ spec: the TLS certificate and key for the resource proxy. type: string type: object + resources: + description: Resources defines the Compute Resources required + by the container for the Argo CD Agent principal component. + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This field depends on the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object server: description: Server defines the server options for the Principal component. @@ -11934,11 +12327,20 @@ spec: required: - content type: object + clusterDomain: + description: |- + ClusterDomain is the cluster domain suffix used for constructing service FQDNs. Defaults to "cluster.local". + The full FQDN will be: ..svc. + This is useful for clusters that use a different DNS suffix (e.g., "CLUSTER_ID.cluster.local", "edge.local"). + type: string cmdParams: additionalProperties: type: string - description: CmdParams specifies command-line parameters for the Argo - CD components. + description: |- + CmdParams specifies command-line parameters for the Argo CD components. + The only keys currently supported for this parameter are: + - controller.resource.health.persist + - applicationsetcontroller.enable.tokenref.strict.mode — when ApplicationSet-in-any-namespace is active, the operator defaults this to "true" type: object configManagementPlugins: description: 'Deprecated: ConfigManagementPlugins field is no longer @@ -13681,6 +14083,21 @@ spec: Controller component. Defaults to ArgoCDDefaultLogLevel if not configured. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Application Controller ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object parallelismLimit: description: ParallelismLimit defines the limit for parallel kubectl operations @@ -13769,6 +14186,15 @@ spec: description: Sharding contains the options for the Application Controller sharding configuration. properties: + algorithm: + description: DistributionAlgorithm determines what algorithm + will be used for distribution of shards. Valid options are + legacy, round-robin, and consistent-hashing + enum: + - legacy + - round-robin + - consistent-hashing + type: string clustersPerShard: description: ClustersPerShard defines the maximum number of clusters managed by each argocd shard @@ -18020,7 +18446,6 @@ spec: NetworkPolicy resources for this Argo CD instance. properties: enabled: - default: true description: |- Enabled defines whether NetworkPolicy resources are created for this Argo CD instance. When enabled, the operator will reconcile NetworkPolicies for Argo CD components. @@ -18248,12 +18673,7 @@ spec: image: description: Image is the Argo CD Notifications image (optional) type: string - logLevel: - description: LogLevel describes the log level that should be used - by the argocd-notifications. Defaults to ArgoCDDefaultLogLevel - if not set. Valid options are debug,info, error, and warn. - type: string - logformat: + logFormat: description: LogFormat refers to the log format used by the argocd-notifications. Defaults to ArgoCDDefaultLogFormat if not configured. Valid options are text or json. @@ -18261,6 +18681,29 @@ spec: - text - json type: string + logLevel: + description: LogLevel describes the log level that should be used + by the argocd-notifications. Defaults to ArgoCDDefaultLogLevel + if not set. Valid options are debug,info, error, and warn. + type: string + logformat: + description: 'Deprecated: use LogFormat instead.' + type: string + metrics: + description: Metrics defines the metrics configuration for the + Notifications ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object replicas: description: Replicas defines the number of replicas to run for notifications-controller @@ -20385,6 +20828,21 @@ spec: by the Repo Server. Defaults to ArgoCDDefaultLogLevel if not set. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Repo Server ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object mountsatoken: description: MountSAToken describes whether you would like to have the Repo server mount the service account token @@ -26192,6 +26650,21 @@ spec: ArgoCD Server component. Defaults to ArgoCDDefaultLogLevel if not set. Valid options are debug, info, error, and warn. type: string + metrics: + description: Metrics defines the metrics configuration for the + Server ServiceMonitor. + properties: + interval: + description: |- + Interval specifies the Prometheus scrape interval for this component's ServiceMonitor. + If empty, Prometheus uses its default scrape interval. + type: string + scrapeTimeout: + description: |- + ScrapeTimeout specifies the Prometheus scrape timeout for this component's ServiceMonitor. + If empty, Prometheus uses the global scrape timeout. + type: string + type: object replicas: description: Replicas defines the number of replicas for argocd-server. Default is nil. Value should be greater than or equal to 0. @@ -32205,6 +32678,149 @@ spec: description: Version is the tag to use with the ArgoCD container image for all ArgoCD components. type: string + webTerminalEnabled: + description: WebTerminalEnabled allows you to get a shell inside a + running pod just like you would with kubectl exec + type: boolean + webhookSecrets: + description: |- + WebhookSecrets references Kubernetes Secrets that supply webhook credentials per provider. + The operator syncs values into argocd-secret under the keys Argo CD expects. + properties: + azureDevOps: + description: 'AzureDevOps: Secret key references for the Azure + DevOps webhook username and password (or PAT).' + properties: + passwordSecretRef: + description: PasswordSecretRef points to the key holding the + password or PAT. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + usernameSecretRef: + description: UsernameSecretRef points to the key holding the + username. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + x-kubernetes-validations: + - message: usernameSecretRef and passwordSecretRef must be set + together + rule: (has(self.usernameSecretRef) && has(self.passwordSecretRef)) + || (!has(self.usernameSecretRef) && !has(self.passwordSecretRef)) + bitbucket: + description: 'Bitbucket: Secret key reference for the Bitbucket + Cloud webhook UUID.' + properties: + webhookUUIDSecretRef: + description: WebhookUUIDSecretRef points to the key holding + the Bitbucket Cloud webhook UUID. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + bitbucketServer: + description: 'BitbucketServer: Secret key reference for the Bitbucket + Server webhook secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + Bitbucket Server webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + github: + description: 'GitHub: Secret key reference for the GitHub webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + GitHub webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + gitlab: + description: 'GitLab: Secret key reference for the GitLab webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + GitLab webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + gogs: + description: 'Gogs: Secret key reference for the Gogs webhook + shared secret.' + properties: + webhookSecretRef: + description: WebhookSecretRef points to the key holding the + Gogs webhook shared secret. + properties: + key: + description: Key in the Secret whose value should be used. + type: string + name: + description: Name of the Secret. + type: string + required: + - key + - name + type: object + type: object + type: object type: object x-kubernetes-validations: - message: spec.sso and spec.oidcConfig cannot both be set