Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix obj key generation, rollback terraform provider to 2.5.1 #16

Merged
merged 2 commits into from
Aug 22, 2023
Merged
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PROJECT_REPO := github.com/linode/$(PROJECT_NAME)

export TERRAFORM_VERSION := 1.3.3
export TERRAFORM_PROVIDER_SOURCE := linode/linode
export TERRAFORM_PROVIDER_VERSION := 2.5.2
export TERRAFORM_PROVIDER_VERSION := 2.5.1
export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-linode
export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-linode_v$(TERRAFORM_PROVIDER_VERSION)
export TERRAFORM_PROVIDER_REPO := https://github.com/linode/terraform-provider-linode
Expand Down
8 changes: 4 additions & 4 deletions apis/database/v1alpha1/zz_mysql_types.go

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

21 changes: 0 additions & 21 deletions apis/image/v1alpha1/zz_generated.deepcopy.go

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

10 changes: 0 additions & 10 deletions apis/image/v1alpha1/zz_image_types.go

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

59 changes: 0 additions & 59 deletions apis/instance/v1alpha1/zz_generated.deepcopy.go

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

23 changes: 0 additions & 23 deletions apis/instance/v1alpha1/zz_instance_types.go

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

4 changes: 2 additions & 2 deletions apis/instance/v1alpha1/zz_ip_types.go

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

4 changes: 2 additions & 2 deletions apis/objectstorage/v1alpha1/zz_key_types.go

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

1 change: 0 additions & 1 deletion config/instance/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ func Configure(p *config.Provider) {
// this resource, which would be "linode"
r.ShortGroup = "instance"
r.UseAsync = true

r.LateInitializer = config.LateInitializer{
IgnoredFields: []string{"disk", "config"},
}
Expand Down
8 changes: 4 additions & 4 deletions config/provider-metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ resources:
dependencies:
linode_database_mysql.my-db: |-
{
"engine_id": "mysql/8.0.30",
"engine_id": "mysql/8.0.26",
"label": "mydatabase",
"region": "us-southeast",
"type": "g6-nanode-1"
Expand All @@ -65,7 +65,7 @@ resources:
- name: foobar
manifest: |-
{
"engine_id": "mysql/8.0.30",
"engine_id": "mysql/8.0.26",
"label": "mydatabase",
"region": "us-southeast",
"type": "g6-nanode-1"
Expand All @@ -78,7 +78,7 @@ resources:
],
"cluster_size": 3,
"encrypted": true,
"engine_id": "mysql/8.0.30",
"engine_id": "mysql/8.0.26",
"label": "mydatabase",
"region": "us-southeast",
"replication_type": "asynch",
Expand All @@ -102,7 +102,7 @@ resources:
created: '- When this Managed Database was created.'
encrypted: '- (Optional) Whether the Managed Databases is encrypted. (default false)'
engine: '- The Managed Database engine. (e.g. mysql)'
engine_id: '- (Required) The Managed Database engine in engine/version format. (e.g. mysql/8.0.30)'
engine_id: '- (Required) The Managed Database engine in engine/version format. (e.g. mysql/8.0.26)'
host_primary: '- The primary host for the Managed Database.'
host_secondary: '- The secondary/private network host for the Managed Database.'
id: '- The ID of the Managed Database.'
Expand Down
2 changes: 1 addition & 1 deletion config/schema.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples-generated/database/accesscontrols.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
name: my-db
spec:
forProvider:
engineId: mysql/8.0.30
engineId: mysql/8.0.26
label: mydatabase
region: us-southeast
type: g6-nanode-1
Expand Down
2 changes: 1 addition & 1 deletion examples-generated/database/mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
name: foobar
spec:
forProvider:
engineId: mysql/8.0.30
engineId: mysql/8.0.26
label: mydatabase
region: us-southeast
type: g6-nanode-1
Expand Down
8 changes: 4 additions & 4 deletions package/crds/database.linode.upbound.io_mysqls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ spec:
type: boolean
engineId:
description: The Managed Database engine in engine/version format.
(e.g. mysql/8.0.30) The Managed Database engine in engine/version
format. (e.g. mysql/8.0.30)
(e.g. mysql/8.0.26) The Managed Database engine in engine/version
format. (e.g. mysql/8.0.26)
type: string
label:
description: A unique, user-defined string referring to the Managed
Expand Down Expand Up @@ -383,8 +383,8 @@ spec:
type: string
engineId:
description: The Managed Database engine in engine/version format.
(e.g. mysql/8.0.30) The Managed Database engine in engine/version
format. (e.g. mysql/8.0.30)
(e.g. mysql/8.0.26) The Managed Database engine in engine/version
format. (e.g. mysql/8.0.26)
type: string
hostPrimary:
description: The primary host for the Managed Database. The primary
Expand Down
11 changes: 0 additions & 11 deletions package/crds/image.linode.upbound.io_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ spec:
type: string
forProvider:
properties:
cloudInit:
description: Whether this image supports cloud-init.
type: boolean
description:
description: A detailed description of this Image. A detailed
description of this Image.
Expand Down Expand Up @@ -441,14 +438,6 @@ spec:
properties:
atProvider:
properties:
capabilities:
description: The capabilities of this Image.
items:
type: string
type: array
cloudInit:
description: Whether this image supports cloud-init.
type: boolean
created:
description: When this Image was created. When this Image was
created.
Expand Down
Loading
Loading