Skip to content

Commit

Permalink
Merge branch 'main' into add-opensearch
Browse files Browse the repository at this point in the history
  • Loading branch information
@Reasonable-Solutions
Reasonable-Solutions authored May 2, 2024
2 parents d0197c4 + 3aa7b29 commit 1235cee
Show file tree
Hide file tree
Showing 22 changed files with 370 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2.0.0
uses: dependabot/fetch-metadata@v2.1.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
Expand Down
28 changes: 26 additions & 2 deletions charts/templates/nais.io_applications.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,13 @@ spec:
disk usage is above the high water mark. Setting this field to true also disables
manual control over disk size, i.e. the `diskSize` parameter will be ignored.
type: boolean
diskAutoresizeLimit:
description: |-
The maximum size, in GB, to which storage capacity can be automatically increased.
The default value is 0, which specifies that there is no limit.
maximum: 1000
minimum: 0
type: integer
diskSize:
description: |-
How much hard drive space to allocate for the SQL server, in gigabytes.
Expand Down Expand Up @@ -696,8 +703,9 @@ spec:
using write-ahead logs.
type: boolean
retainedBackups:
description: Number of daily backups to retain. Defaults
to 7 backups.
description: |-
Number of daily backups to retain. Defaults to 7 backups.
The number of retained backups must be greater or equal to TransactionLogRetentionDays.
maximum: 365
minimum: 1
type: integer
Expand All @@ -708,6 +716,12 @@ spec:
Custom memory must be mulitple of 256 MB and at least 3.75 GB (e.g. `db-custom-1-3840` for 1 cpu, 3840 MB ram)
pattern: db-.+
type: string
transactionLogRetentionDays:
description: The number of days of transaction logs gcp
retains for point in time restores.
maximum: 7
minimum: 1
type: integer
type:
description: PostgreSQL version.
enum:
Expand Down Expand Up @@ -994,6 +1008,16 @@ spec:
This will be included in the final scope `nav:<Product><Name>`.
pattern: ^[a-z0-9]+$
type: string
separator:
description: |-
Separator is the character that separates `product` and `name` in the final scope:
`scope := <prefix>:<product><separator><name>`
This overrides the default separator.
The default separator is `:`. If `name` contains `/`, the default separator is instead `/`.
maxLength: 1
minLength: 1
pattern: ^[\/:]$
type: string
required:
- enabled
- name
Expand Down
10 changes: 10 additions & 0 deletions charts/templates/nais.io_maskinportenclients.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@ spec:
This will be included in the final scope `nav:<Product><Name>`.
pattern: ^[a-z0-9]+$
type: string
separator:
description: |-
Separator is the character that separates `product` and `name` in the final scope:
`scope := <prefix>:<product><separator><name>`
This overrides the default separator.
The default separator is `:`. If `name` contains `/`, the default separator is instead `/`.
maxLength: 1
minLength: 1
pattern: ^[\/:]$
type: string
required:
- enabled
- name
Expand Down
28 changes: 26 additions & 2 deletions charts/templates/nais.io_naisjobs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,13 @@ spec:
disk usage is above the high water mark. Setting this field to true also disables
manual control over disk size, i.e. the `diskSize` parameter will be ignored.
type: boolean
diskAutoresizeLimit:
description: |-
The maximum size, in GB, to which storage capacity can be automatically increased.
The default value is 0, which specifies that there is no limit.
maximum: 1000
minimum: 0
type: integer
diskSize:
description: |-
How much hard drive space to allocate for the SQL server, in gigabytes.
Expand Down Expand Up @@ -656,8 +663,9 @@ spec:
using write-ahead logs.
type: boolean
retainedBackups:
description: Number of daily backups to retain. Defaults
to 7 backups.
description: |-
Number of daily backups to retain. Defaults to 7 backups.
The number of retained backups must be greater or equal to TransactionLogRetentionDays.
maximum: 365
minimum: 1
type: integer
Expand All @@ -668,6 +676,12 @@ spec:
Custom memory must be mulitple of 256 MB and at least 3.75 GB (e.g. `db-custom-1-3840` for 1 cpu, 3840 MB ram)
pattern: db-.+
type: string
transactionLogRetentionDays:
description: The number of days of transaction logs gcp
retains for point in time restores.
maximum: 7
minimum: 1
type: integer
type:
description: PostgreSQL version.
enum:
Expand Down Expand Up @@ -860,6 +874,16 @@ spec:
This will be included in the final scope `nav:<Product><Name>`.
pattern: ^[a-z0-9]+$
type: string
separator:
description: |-
Separator is the character that separates `product` and `name` in the final scope:
`scope := <prefix>:<product><separator><name>`
This overrides the default separator.
The default separator is `:`. If `name` contains `/`, the default separator is instead `/`.
maxLength: 1
minLength: 1
pattern: ^[\/:]$
type: string
required:
- enabled
- name
Expand Down
28 changes: 26 additions & 2 deletions config/crd/bases/nais.io_applications.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,13 @@ spec:
disk usage is above the high water mark. Setting this field to true also disables
manual control over disk size, i.e. the `diskSize` parameter will be ignored.
type: boolean
diskAutoresizeLimit:
description: |-
The maximum size, in GB, to which storage capacity can be automatically increased.
The default value is 0, which specifies that there is no limit.
maximum: 1000
minimum: 0
type: integer
diskSize:
description: |-
How much hard drive space to allocate for the SQL server, in gigabytes.
Expand Down Expand Up @@ -696,8 +703,9 @@ spec:
using write-ahead logs.
type: boolean
retainedBackups:
description: Number of daily backups to retain. Defaults
to 7 backups.
description: |-
Number of daily backups to retain. Defaults to 7 backups.
The number of retained backups must be greater or equal to TransactionLogRetentionDays.
maximum: 365
minimum: 1
type: integer
Expand All @@ -708,6 +716,12 @@ spec:
Custom memory must be mulitple of 256 MB and at least 3.75 GB (e.g. `db-custom-1-3840` for 1 cpu, 3840 MB ram)
pattern: db-.+
type: string
transactionLogRetentionDays:
description: The number of days of transaction logs gcp
retains for point in time restores.
maximum: 7
minimum: 1
type: integer
type:
description: PostgreSQL version.
enum:
Expand Down Expand Up @@ -994,6 +1008,16 @@ spec:
This will be included in the final scope `nav:<Product><Name>`.
pattern: ^[a-z0-9]+$
type: string
separator:
description: |-
Separator is the character that separates `product` and `name` in the final scope:
`scope := <prefix>:<product><separator><name>`
This overrides the default separator.
The default separator is `:`. If `name` contains `/`, the default separator is instead `/`.
maxLength: 1
minLength: 1
pattern: ^[\/:]$
type: string
required:
- enabled
- name
Expand Down
10 changes: 10 additions & 0 deletions config/crd/bases/nais.io_maskinportenclients.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@ spec:
This will be included in the final scope `nav:<Product><Name>`.
pattern: ^[a-z0-9]+$
type: string
separator:
description: |-
Separator is the character that separates `product` and `name` in the final scope:
`scope := <prefix>:<product><separator><name>`
This overrides the default separator.
The default separator is `:`. If `name` contains `/`, the default separator is instead `/`.
maxLength: 1
minLength: 1
pattern: ^[\/:]$
type: string
required:
- enabled
- name
Expand Down
28 changes: 26 additions & 2 deletions config/crd/bases/nais.io_naisjobs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,13 @@ spec:
disk usage is above the high water mark. Setting this field to true also disables
manual control over disk size, i.e. the `diskSize` parameter will be ignored.
type: boolean
diskAutoresizeLimit:
description: |-
The maximum size, in GB, to which storage capacity can be automatically increased.
The default value is 0, which specifies that there is no limit.
maximum: 1000
minimum: 0
type: integer
diskSize:
description: |-
How much hard drive space to allocate for the SQL server, in gigabytes.
Expand Down Expand Up @@ -656,8 +663,9 @@ spec:
using write-ahead logs.
type: boolean
retainedBackups:
description: Number of daily backups to retain. Defaults
to 7 backups.
description: |-
Number of daily backups to retain. Defaults to 7 backups.
The number of retained backups must be greater or equal to TransactionLogRetentionDays.
maximum: 365
minimum: 1
type: integer
Expand All @@ -668,6 +676,12 @@ spec:
Custom memory must be mulitple of 256 MB and at least 3.75 GB (e.g. `db-custom-1-3840` for 1 cpu, 3840 MB ram)
pattern: db-.+
type: string
transactionLogRetentionDays:
description: The number of days of transaction logs gcp
retains for point in time restores.
maximum: 7
minimum: 1
type: integer
type:
description: PostgreSQL version.
enum:
Expand Down Expand Up @@ -860,6 +874,16 @@ spec:
This will be included in the final scope `nav:<Product><Name>`.
pattern: ^[a-z0-9]+$
type: string
separator:
description: |-
Separator is the character that separates `product` and `name` in the final scope:
`scope := <prefix>:<product><separator><name>`
This overrides the default separator.
The default separator is `:`. If `name` contains `/`, the default separator is instead `/`.
maxLength: 1
minLength: 1
pattern: ^[\/:]$
type: string
required:
- enabled
- name
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/sql.cnrm.cloud.google.com_sqldatabases.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@ spec:
properties:
instanceRef:
properties:
external:
type: string
name:
type: string
namespace:
type: string
required:
- name
type: object
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/sql.cnrm.cloud.google.com_sqlinstances.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ spec:
properties:
retainedBackups:
type: integer
transactionLogRetentionDays:
type: integer
required:
- retainedBackups
- transactionLogRetentionDays
type: object
enabled:
type: boolean
Expand All @@ -81,6 +84,8 @@ spec:
type: array
diskAutoresize:
type: boolean
diskAutoresizeLimit:
type: integer
diskSize:
type: integer
diskType:
Expand Down Expand Up @@ -130,6 +135,7 @@ spec:
- backupConfiguration
- databaseFlags
- diskAutoresize
- diskAutoresizeLimit
- diskSize
- diskType
- insightsConfig
Expand Down
63 changes: 63 additions & 0 deletions config/crd/bases/sql.cnrm.cloud.google.com_sqlsslcerts.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
name: sqlsslcerts.sql.cnrm.cloud.google.com
spec:
group: sql.cnrm.cloud.google.com
names:
kind: SQLSSLCert
listKind: SQLSSLCertList
plural: sqlsslcerts
singular: sqlsslcert
scope: Namespaced
versions:
- name: v1beta1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
properties:
commonName:
type: string
instanceRef:
properties:
external:
type: string
name:
type: string
namespace:
type: string
required:
- name
type: object
resourceID:
type: string
required:
- commonName
- instanceRef
type: object
required:
- spec
type: object
served: true
storage: true
4 changes: 4 additions & 0 deletions config/crd/bases/sql.cnrm.cloud.google.com_sqlusers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@ spec:
type: string
instanceRef:
properties:
external:
type: string
name:
type: string
namespace:
type: string
required:
- name
type: object
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.16.1 // indirect
Expand Down
Loading

0 comments on commit 1235cee

Please sign in to comment.