Skip to content

Commit

Permalink
Prepare upcoming 0.10.25 release (#1374)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeljguarino authored Sep 13, 2024
1 parent ef3786e commit 8b91472
Show file tree
Hide file tree
Showing 32 changed files with 575 additions and 46 deletions.
2 changes: 1 addition & 1 deletion AGENT_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.4.43
v0.4.45
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ ENV HELM_VERSION=v3.10.3
ENV TERRAFORM_VERSION=v1.2.9

# renovate: datasource=github-releases depName=pluralsh/plural-cli
ENV CLI_VERSION=v0.9.14
ENV CLI_VERSION=v0.9.15

# renovate: datasource=github-tags depName=kubernetes/kubernetes
ENV KUBECTL_VERSION=v1.25.5
Expand Down
9 changes: 9 additions & 0 deletions assets/src/generated/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,14 @@ export type ConfigurationValidation = {
type?: Maybe<Scalars['String']['output']>;
};

/** Validations to apply to this configuration entry prior to PR creation */
export type ConfigurationValidationAttributes = {
/** whether the string is json encoded */
json?: InputMaybe<Scalars['Boolean']['input']>;
/** regex a string value should match */
regex?: InputMaybe<Scalars['String']['input']>;
};

export enum Conjunction {
And = 'AND',
Or = 'OR'
Expand Down Expand Up @@ -4091,6 +4099,7 @@ export type PrConfigurationAttributes = {
optional?: InputMaybe<Scalars['Boolean']['input']>;
placeholder?: InputMaybe<Scalars['String']['input']>;
type: ConfigurationType;
validation?: InputMaybe<ConfigurationValidationAttributes>;
values?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
};

Expand Down
13 changes: 13 additions & 0 deletions charts/controller/crds/deployments.plural.sh_customstackruns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,19 @@ spec:
- PASSWORD
- ENUM
type: string
validation:
description: Any additional validations you want to apply to
this configuration item before generating a pr
properties:
json:
description: Whether the string value is supposed to be
json-encoded
type: boolean
regex:
description: A regex to match string-valued configuration
items
type: string
type: object
values:
items:
type: string
Expand Down
13 changes: 13 additions & 0 deletions charts/controller/crds/deployments.plural.sh_prautomations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,19 @@ spec:
- PASSWORD
- ENUM
type: string
validation:
description: Any additional validations you want to apply to
this configuration item before generating a pr
properties:
json:
description: Whether the string value is supposed to be
json-encoded
type: boolean
regex:
description: A regex to match string-valued configuration
items
type: string
type: object
values:
items:
type: string
Expand Down
27 changes: 18 additions & 9 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: 25 additions & 1 deletion go/controller/api/v1alpha1/prautomation_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,27 @@ type PrAutomationConfiguration struct {
// +kubebuilder:validation:Optional
Placeholder *string `json:"placeholder,omitempty"`

// Any additional validations you want to apply to this configuration item before generating a pr
// +kubebuilder:validation:Optional
Validation *PrAutomationConfigurationValidation `json:"validation,omitempty"`

// +kubebuilder:validation:Optional
Values []*string `json:"values,omitempty"`
}

// PrAutomationConfigurationValidation validations to apply to configuration items in a PR Automation
type PrAutomationConfigurationValidation struct {
// A regex to match string-valued configuration items
// +kubebuilder:validation:Optional
Regex *string `json:"regex,omitempty"`

// Whether the string value is supposed to be json-encoded
// +kubebuilder:validation:Optional
Json *bool `json:"json,omitempty"`
}

func (in *PrAutomationConfiguration) Attributes() *console.PrConfigurationAttributes {
return &console.PrConfigurationAttributes{
conf := &console.PrConfigurationAttributes{
Type: in.Type,
Name: in.Name,
Default: in.Default,
Expand All @@ -374,6 +389,15 @@ func (in *PrAutomationConfiguration) Attributes() *console.PrConfigurationAttrib
Condition: in.Condition.Attributes(),
Values: in.Values,
}

if in.Validation != nil {
conf.Validation = &console.ConfigurationValidationAttributes{
Regex: in.Validation.Regex,
JSON: in.Validation.Json,
}
}

return conf
}

// Condition ...
Expand Down
30 changes: 30 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 @@ -114,6 +114,19 @@ spec:
- PASSWORD
- ENUM
type: string
validation:
description: Any additional validations you want to apply to
this configuration item before generating a pr
properties:
json:
description: Whether the string value is supposed to be
json-encoded
type: boolean
regex:
description: A regex to match string-valued configuration
items
type: string
type: object
values:
items:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,19 @@ spec:
- PASSWORD
- ENUM
type: string
validation:
description: Any additional validations you want to apply to
this configuration item before generating a pr
properties:
json:
description: Whether the string value is supposed to be
json-encoded
type: boolean
regex:
description: A regex to match string-valued configuration
items
type: string
type: object
values:
items:
type: string
Expand Down
Loading

0 comments on commit 8b91472

Please sign in to comment.