Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ishitasequeira
ishitasequeira authored Nov 6, 2023
2 parents 7491998 + 58da6a3 commit 33d40ce
Show file tree
Hide file tree
Showing 18 changed files with 1,948 additions and 719 deletions.
7 changes: 7 additions & 0 deletions assets/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6395,6 +6395,13 @@
"type": "string"
}
},
"components": {
"type": "array",
"title": "Components specifies a list of kustomize components to add to the kustomization before building",
"items": {
"type": "string"
}
},
"forceCommonAnnotations": {
"type": "boolean",
"title": "ForceCommonAnnotations specifies whether to force applying common annotations to resources for Kustomize apps"
Expand Down
1 change: 1 addition & 0 deletions docs/user-guide/kustomize.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The following configuration options are available for Kustomize:
* `forceCommonAnnotations` is a boolean value which defines if it's allowed to override existing annotations
* `commonAnnotationsEnvsubst` is a boolean value which enables env variables substition in annotation values
* `patches` is a list of Kustomize patches that supports inline updates
* `components` is a list of Kustomize components

To use Kustomize with an overlay, point your path to the overlay.

Expand Down
268 changes: 268 additions & 0 deletions manifests/core-install.yaml
View file

Large diffs are not rendered by default.

76 changes: 76 additions & 0 deletions manifests/crds/application-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,12 @@ spec:
description: CommonLabels is a list of additional labels
to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether
to force applying common annotations to resources for
Expand Down Expand Up @@ -647,6 +653,12 @@ spec:
description: CommonLabels is a list of additional labels
to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether
to force applying common annotations to resources
Expand Down Expand Up @@ -1092,6 +1104,12 @@ spec:
description: CommonLabels is a list of additional labels to
add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize components
to add to the kustomization before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether to force
applying common annotations to resources for Kustomize apps
Expand Down Expand Up @@ -1410,6 +1428,12 @@ spec:
description: CommonLabels is a list of additional labels
to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize components
to add to the kustomization before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether to
force applying common annotations to resources for Kustomize
Expand Down Expand Up @@ -1881,6 +1905,12 @@ spec:
description: CommonLabels is a list of additional labels
to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether
to force applying common annotations to resources
Expand Down Expand Up @@ -2213,6 +2243,12 @@ spec:
description: CommonLabels is a list of additional
labels to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether
to force applying common annotations to resources
Expand Down Expand Up @@ -2689,6 +2725,13 @@ spec:
description: CommonLabels is a list of additional
labels to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before
building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies
whether to force applying common annotations
Expand Down Expand Up @@ -3038,6 +3081,13 @@ spec:
description: CommonLabels is a list of additional
labels to add to rendered manifests
type: object
components:
description: Components specifies a list of
kustomize components to add to the kustomization
before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies
whether to force applying common annotations
Expand Down Expand Up @@ -3502,6 +3552,12 @@ spec:
description: CommonLabels is a list of additional
labels to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether
to force applying common annotations to resources
Expand Down Expand Up @@ -3844,6 +3900,13 @@ spec:
description: CommonLabels is a list of additional
labels to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before
building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether
to force applying common annotations to resources
Expand Down Expand Up @@ -4330,6 +4393,12 @@ spec:
description: CommonLabels is a list of additional
labels to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether
to force applying common annotations to resources
Expand Down Expand Up @@ -4672,6 +4741,13 @@ spec:
description: CommonLabels is a list of additional
labels to add to rendered manifests
type: object
components:
description: Components specifies a list of kustomize
components to add to the kustomization before
building
items:
type: string
type: array
forceCommonAnnotations:
description: ForceCommonAnnotations specifies whether
to force applying common annotations to resources
Expand Down
Loading

0 comments on commit 33d40ce

Please sign in to comment.