Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions assets/src/generated/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6635,6 +6635,8 @@ export type PrAutomation = {
darkIcon?: Maybe<Scalars['String']['output']>;
deletes?: Maybe<PrDeleteSpec>;
documentation?: Maybe<Scalars['String']['output']>;
/** location in git for external templates and scripts */
git?: Maybe<GitRef>;
/** an icon url to use for this catalog */
icon?: Maybe<Scalars['String']['output']>;
id: Scalars['ID']['output'];
Expand All @@ -6643,6 +6645,8 @@ export type PrAutomation = {
insertedAt?: Maybe<Scalars['DateTime']['output']>;
/** labels to apply to the created prs */
labels?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
/** a set of lua scripts to use to preprocess the PR automation */
lua?: Maybe<PrLuaSpec>;
message: Scalars['String']['output'];
/** the name for this automation */
name: Scalars['String']['output'];
Expand Down Expand Up @@ -6684,6 +6688,8 @@ export type PrAutomationAttributes = {
darkIcon?: InputMaybe<Scalars['String']['input']>;
deletes?: InputMaybe<PrAutomationDeleteSpecAttributes>;
documentation?: InputMaybe<Scalars['String']['input']>;
/** location in git for external templates and scripts */
git?: InputMaybe<GitRefAttributes>;
/** the governance controller to use for this pr */
governanceId?: InputMaybe<Scalars['ID']['input']>;
/** an icon url to use for this catalog */
Expand All @@ -6692,6 +6698,8 @@ export type PrAutomationAttributes = {
identifier?: InputMaybe<Scalars['String']['input']>;
/** labels to apply to created prs */
labels?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
/** a specification for sourcing lua scripts to preprocess the PR automation */
lua?: InputMaybe<PrLuaSpecAttributes>;
message?: InputMaybe<Scalars['String']['input']>;
name?: InputMaybe<Scalars['String']['input']>;
/** whether to generate a patch for this pr instead of a full pr */
Expand Down Expand Up @@ -6896,6 +6904,23 @@ export type PrGovernanceConfigurationAttributes = {
webhook?: InputMaybe<GovernanceWebhookAttributes>;
};

/** a specification for sourcing lua scripts to preprocess the PR automation */
export type PrLuaSpec = {
__typename?: 'PrLuaSpec';
/** a folder with lua library code and scripts to use */
folder?: Maybe<Scalars['String']['output']>;
/** file of a flat script to use */
script?: Maybe<Scalars['String']['output']>;
};

/** a specification for sourcing lua scripts to preprocess the PR automation */
export type PrLuaSpecAttributes = {
/** a folder with lua library code and scripts to use */
folder?: InputMaybe<Scalars['String']['input']>;
/** file of a flat script to use */
script?: InputMaybe<Scalars['String']['input']>;
};

export enum PrRole {
Cluster = 'CLUSTER',
Cost = 'COST',
Expand Down
Binary file modified charts/console-rapid/charts/controller-0.0.158.tgz
Binary file not shown.
Binary file modified charts/console-rapid/charts/kas-0.3.0.tgz
Binary file not shown.
Binary file modified charts/console/charts/controller-0.0.158.tgz
Binary file not shown.
Binary file modified charts/console/charts/kas-0.3.0.tgz
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,9 @@ spec:
Used for inflating Helm charts.
type: boolean
path:
description: Path to the kustomization file to use.
description: The folder your base kustomization file lives
within relative to your main git folder path. It can be
a subdirectory.
type: string
required:
- path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,9 @@ spec:
Used for inflating Helm charts.
type: boolean
path:
description: Path to the kustomization file to use.
description: The folder your base kustomization file lives
within relative to your main git folder path. It can be
a subdirectory.
type: string
required:
- path
Expand Down
32 changes: 32 additions & 0 deletions charts/controller/crds/deployments.plural.sh_prautomations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,27 @@ spec:
Documentation provides detailed explanation of what this automation does,
when to use it, and any prerequisites or considerations.
type: string
git:
description: Git location to source external files from. If `creates.git`
is also specified, the results will be merged.
properties:
files:
description: Optional files to add to the manifests for this service
items:
type: string
type: array
folder:
description: Folder is the folder in the Git repository where
the manifests are located.
type: string
ref:
description: Ref is the Git reference (branch, tag, or commit)
to use.
type: string
required:
- folder
- ref
type: object
icon:
description: |-
Icon provides a URL to an icon image to visually represent this automation
Expand All @@ -440,6 +461,17 @@ spec:
items:
type: string
type: array
lua:
description: Lua specification to source lua scripts to preprocess
the PR automation.
properties:
folder:
description: Folder with lua library code and scripts to use
type: string
script:
description: File of a flat script to use
type: string
type: object
message:
description: |-
Message defines the commit message template that will be used in the generated PR.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,9 @@ spec:
Used for inflating Helm charts.
type: boolean
path:
description: Path to the kustomization file to use.
description: The folder your base kustomization file lives
within relative to your main git folder path. It can be
a subdirectory.
type: string
required:
- path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,8 @@ spec:
Used for inflating Helm charts.
type: boolean
path:
description: Path to the kustomization file to use.
description: The folder your base kustomization file lives within
relative to your main git folder path. It can be a subdirectory.
type: string
required:
- path
Expand Down
24 changes: 24 additions & 0 deletions go/client/models_gen.go

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

26 changes: 26 additions & 0 deletions go/controller/api/v1alpha1/prautomation_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ type PrAutomationSpec struct {
// +kubebuilder:validation:Optional
RepositoryRef *corev1.ObjectReference `json:"repositoryRef,omitempty"`

// Git location to source external files from. If `creates.git` is also specified, the results will be merged.
// +kubebuilder:validation:Optional
Git *GitRef `json:"git,omitempty"`

// ServiceRef references a specific service that this PR automation acts upon.
// +kubebuilder:validation:Optional
ServiceRef *corev1.ObjectReference `json:"serviceRef,omitempty"`
Expand Down Expand Up @@ -207,6 +211,10 @@ type PrAutomationSpec struct {
// +kubebuilder:validation:Optional
Deletes *PrAutomationDeleteConfiguration `json:"deletes,omitempty"`

// Lua specification to source lua scripts to preprocess the PR automation.
// +kubebuilder:validation:Optional
Lua *PrAutomationLuaConfiguration `json:"lua,omitempty"`

// Reconciliation settings for this resource.
// Controls drift detection and reconciliation intervals.
// +kubebuilder:validation:Optional
Expand Down Expand Up @@ -632,3 +640,21 @@ func (in *PrAutomationSecretEntry) Attributes() *console.PrSecretEntryAttributes
Autogenerate: in.Autogenerate,
}
}

type PrAutomationLuaConfiguration struct {
// File of a flat script to use
// +kubebuilder:validation:Optional
Script *string `json:"script,omitempty"`

// Folder with lua library code and scripts to use
// +kubebuilder:validation:Optional
Folder *string `json:"folder,omitempty"`
}

func (in *PrAutomationLuaConfiguration) Attributes() *console.PrLuaSpecAttributes {
if in == nil {
return nil
}

return &console.PrLuaSpecAttributes{Script: in.Script, Folder: in.Folder}
}
2 changes: 1 addition & 1 deletion go/controller/api/v1alpha1/servicedeployment_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type ComponentState string
const ComponentStateRunning ComponentState = "RUNNING"

type ServiceKustomize struct {
// Path to the kustomization file to use.
// The folder your base kustomization file lives within relative to your main git folder path. It can be a subdirectory.
Path string `json:"path"`

// EnableHelm indicates whether to enable Helm for this Kustomize deployment.
Expand Down
35 changes: 35 additions & 0 deletions go/controller/api/v1alpha1/zz_generated.deepcopy.go

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

Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,9 @@ spec:
Used for inflating Helm charts.
type: boolean
path:
description: Path to the kustomization file to use.
description: The folder your base kustomization file lives
within relative to your main git folder path. It can be
a subdirectory.
type: string
required:
- path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,9 @@ spec:
Used for inflating Helm charts.
type: boolean
path:
description: Path to the kustomization file to use.
description: The folder your base kustomization file lives
within relative to your main git folder path. It can be
a subdirectory.
type: string
required:
- path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,27 @@ spec:
Documentation provides detailed explanation of what this automation does,
when to use it, and any prerequisites or considerations.
type: string
git:
description: Git location to source external files from. If `creates.git`
is also specified, the results will be merged.
properties:
files:
description: Optional files to add to the manifests for this service
items:
type: string
type: array
folder:
description: Folder is the folder in the Git repository where
the manifests are located.
type: string
ref:
description: Ref is the Git reference (branch, tag, or commit)
to use.
type: string
required:
- folder
- ref
type: object
icon:
description: |-
Icon provides a URL to an icon image to visually represent this automation
Expand All @@ -440,6 +461,17 @@ spec:
items:
type: string
type: array
lua:
description: Lua specification to source lua scripts to preprocess
the PR automation.
properties:
folder:
description: Folder with lua library code and scripts to use
type: string
script:
description: File of a flat script to use
type: string
type: object
message:
description: |-
Message defines the commit message template that will be used in the generated PR.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,9 @@ spec:
Used for inflating Helm charts.
type: boolean
path:
description: Path to the kustomization file to use.
description: The folder your base kustomization file lives
within relative to your main git folder path. It can be
a subdirectory.
type: string
required:
- path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,8 @@ spec:
Used for inflating Helm charts.
type: boolean
path:
description: Path to the kustomization file to use.
description: The folder your base kustomization file lives within
relative to your main git folder path. It can be a subdirectory.
type: string
required:
- path
Expand Down
Loading
Loading