Skip to content

Commit 2cb3838

Browse files
chore: Apply CVE fixes on new main (tip of stable/0.26) (#1165)
* [gitops-operator]chore: Apply CVE fixes on new main (tip of stable/0.26) * re-enable component test * update restrictedgitsources crd --------- Co-authored-by: codefresh-v2-pipelines[bot] <109073600+codefresh-v2-pipelines[bot]@users.noreply.github.com> Co-authored-by: scme0 <scott.merchant@octopus.com>
1 parent d499a7d commit 2cb3838

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed

.github/workflows/component-test.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515

1616
jobs:
1717
component-test:
18-
if : false # temporarily disable component tests
1918
runs-on: ubuntu-latest
2019

2120
env:

charts/gitops-runtime/templates/_components/gitops-operator/crds/restrictedgitsources.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,14 @@ spec:
286286
description: SkipCrds skips custom resource definition installation
287287
step (Helm's --skip-crds)
288288
type: boolean
289+
skipSchemaValidation:
290+
description: SkipSchemaValidation skips JSON schema validation
291+
(Helm's --skip-schema-validation)
292+
type: boolean
293+
skipTests:
294+
description: SkipTests skips test manifest installation step
295+
(Helm's --skip-tests).
296+
type: boolean
289297
valueFiles:
290298
description: ValuesFiles is a list of Helm value files to
291299
use when generating a template
@@ -348,6 +356,11 @@ spec:
348356
description: ForceCommonLabels specifies whether to force
349357
applying common labels to resources for Kustomize apps
350358
type: boolean
359+
ignoreMissingComponents:
360+
description: IgnoreMissingComponents prevents kustomize from
361+
failing when components do not exist locally by not appending
362+
them to kustomization file
363+
type: boolean
351364
images:
352365
description: Images is a list of Kustomize image override
353366
specifications
@@ -361,6 +374,10 @@ spec:
361374
KubeVersion specifies the Kubernetes API version to pass to Helm when templating manifests. By default, Argo CD
362375
uses the Kubernetes version of the target cluster.
363376
type: string
377+
labelIncludeTemplates:
378+
description: LabelIncludeTemplates specifies whether to apply
379+
common labels to resource templates or not
380+
type: boolean
364381
labelWithoutSelector:
365382
description: LabelWithoutSelector specifies whether to apply
366383
common labels to resource selectors or not
@@ -432,6 +449,10 @@ spec:
432449
use for rendering manifests
433450
type: string
434451
type: object
452+
name:
453+
description: Name is used to refer to a source and is displayed
454+
in the UI. It is used in multi-source Applications.
455+
type: string
435456
path:
436457
description: Path is a directory path within the Git repository,
437458
and is only valid for applications sourced from Git.
@@ -519,6 +540,10 @@ spec:
519540
description: 'AllowEmpty allows apps have zero live resources
520541
(default: false)'
521542
type: boolean
543+
enabled:
544+
description: Enable allows apps to explicitly control automated
545+
sync
546+
type: boolean
522547
prune:
523548
description: 'Prune specifies whether to delete resources
524549
from the cluster that are not found in the sources anymore
@@ -570,6 +595,10 @@ spec:
570595
a failed sync. If set to 0, no retries will be performed.
571596
format: int64
572597
type: integer
598+
refresh:
599+
description: 'Refresh indicates if the latest revision should
600+
be used on retry instead of the initial one (default: false)'
601+
type: boolean
573602
type: object
574603
syncOptions:
575604
description: Options allow you to specify whole app sync-options

charts/gitops-runtime/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ gitops-operator:
647647
image:
648648
registry: quay.io
649649
repository: codefresh/codefresh-gitops-operator
650-
tag: b9540c4
650+
tag: bc5c4eb
651651
env:
652652
!!merge <<:
653653
- *otel-config

0 commit comments

Comments
 (0)