Skip to content

Commit fd481eb

Browse files
authored
Merge pull request #4 from eljohnson92/update_linode_version
update to linode terraform version 1.30.0
2 parents 0b3c52e + 1ac72bc commit fd481eb

File tree

13 files changed

+108
-47
lines changed

13 files changed

+108
-47
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ PROJECT_REPO := github.com/linode/$(PROJECT_NAME)
66

77
export TERRAFORM_VERSION := 1.3.3
88
export TERRAFORM_PROVIDER_SOURCE := linode/linode
9-
export TERRAFORM_PROVIDER_VERSION := 1.29.4
9+
export TERRAFORM_PROVIDER_VERSION := 1.30.0
1010
export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-linode
11-
export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-linode_v1.29.4
12-
export TERRAFORM_PROVIDER_REPO := https://github.com/srust/terraform-provider-linode
11+
export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-linode_v1.30.0
12+
export TERRAFORM_PROVIDER_REPO := https://github.com/linode/terraform-provider-linode
1313
export TERRAFORM_DOCS_PATH := website/docs/r
1414

1515
#PLATFORMS ?= linux_amd64 linux_arm64

apis/instance/v1alpha1/zz_generated.deepcopy.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/instance/v1alpha1/zz_instance_types.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/user/v1alpha1/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/user/v1alpha1/zz_user_types.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build

config/provider-metadata.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,13 @@ resources:
672672
manifest: |-
673673
{
674674
"booted": true,
675+
"connection": [
676+
{
677+
"host": "${linode_instance.my-instance.ip_address}",
678+
"password": "myc00lpass!",
679+
"user": "root"
680+
}
681+
],
675682
"devices": [
676683
{
677684
"sda": [
@@ -702,9 +709,19 @@ resources:
702709
}
703710
],
704711
"label": "my-config",
705-
"linode_id": "${linode_instance.my-instance.id}"
712+
"linode_id": "${linode_instance.my-instance.id}",
713+
"provisioner": {
714+
"remote-exec": [
715+
{
716+
"inline": [
717+
"echo 'Hello World!'"
718+
]
719+
}
720+
]
721+
}
706722
}
707723
references:
724+
connection.host: linode_instance.my-instance.ip_address
708725
devices.sda.disk_id: linode_instance_disk.boot.id
709726
devices.sdb.disk_id: linode_instance_disk.swap.id
710727
linode_id: linode_instance.my-instance.id
@@ -832,7 +849,7 @@ resources:
832849
dependencies:
833850
linode_instance.foo: |-
834851
{
835-
"image": "linode/alpine3.12",
852+
"image": "linode/alpine3.16",
836853
"label": "foobar-test",
837854
"region": "us-east",
838855
"type": "g6-nanode-1"
@@ -1514,6 +1531,7 @@ resources:
15141531
}
15151532
argumentDocs:
15161533
account-access: '- (optional) The level of access this User has to Account-level actions, like billing information. (read_only, read_write)'
1534+
add_databases: '- (optional) If true, this User may add Databases.'
15171535
add_domains: '- (optional) If true, this User may add Domains.'
15181536
add_firewalls: '- (optional) If true, this User may add Firewalls.'
15191537
add_images: '- (optional) If true, this User may add Images.'

config/schema.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

examples-generated/instance/ip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ metadata:
2525
name: foo
2626
spec:
2727
forProvider:
28-
image: linode/alpine3.12
28+
image: linode/alpine3.16
2929
label: foobar-test
3030
region: us-east
3131
type: g6-nanode-1

go.mod

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/crossplane/crossplane-runtime v0.19.0-rc.0.0.20221012013934-bce61005a175
77
github.com/crossplane/crossplane-tools v0.0.0-20220310165030-1f43fc12793e
88
github.com/pkg/errors v0.9.1
9-
github.com/upbound/upjet v0.8.0-rc.0.0.20221115075453-606a1db65fa2
9+
github.com/upbound/upjet v0.8.0
1010
gopkg.in/alecthomas/kingpin.v2 v2.2.6
1111
k8s.io/apimachinery v0.25.0
1212
k8s.io/client-go v0.25.0
@@ -15,8 +15,6 @@ require (
1515
)
1616

1717
require (
18-
github.com/PuerkitoBio/purell v1.1.1 // indirect
19-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2018
github.com/agext/levenshtein v1.2.3 // indirect
2119
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
2220
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
@@ -38,17 +36,17 @@ require (
3836
github.com/go-logr/logr v1.2.3 // indirect
3937
github.com/go-logr/zapr v1.2.3 // indirect
4038
github.com/go-openapi/jsonpointer v0.19.5 // indirect
41-
github.com/go-openapi/jsonreference v0.19.5 // indirect
42-
github.com/go-openapi/swag v0.19.14 // indirect
39+
github.com/go-openapi/jsonreference v0.20.0 // indirect
40+
github.com/go-openapi/swag v0.21.1 // indirect
4341
github.com/gobuffalo/flect v0.2.3 // indirect
4442
github.com/gogo/protobuf v1.3.2 // indirect
4543
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4644
github.com/golang/mock v1.6.0 // indirect
4745
github.com/golang/protobuf v1.5.2 // indirect
4846
github.com/golang/snappy v0.0.4 // indirect
49-
github.com/google/gnostic v0.5.7-v3refs // indirect
47+
github.com/google/gnostic v0.6.9 // indirect
5048
github.com/google/go-cmp v0.5.9 // indirect
51-
github.com/google/gofuzz v1.1.0 // indirect
49+
github.com/google/gofuzz v1.2.0 // indirect
5250
github.com/google/uuid v1.3.0 // indirect
5351
github.com/hashicorp/errwrap v1.1.0 // indirect
5452
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -81,9 +79,9 @@ require (
8179
github.com/inconshreveable/mousetrap v1.0.0 // indirect
8280
github.com/josharian/intern v1.0.0 // indirect
8381
github.com/json-iterator/go v1.1.12 // indirect
84-
github.com/mailru/easyjson v0.7.6 // indirect
82+
github.com/mailru/easyjson v0.7.7 // indirect
8583
github.com/mattn/go-colorable v0.1.12 // indirect
86-
github.com/mattn/go-isatty v0.0.14 // indirect
84+
github.com/mattn/go-isatty v0.0.16 // indirect
8785
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
8886
github.com/mitchellh/copystructure v1.2.0 // indirect
8987
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -118,14 +116,14 @@ require (
118116
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
119117
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
120118
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
121-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
122-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
119+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
120+
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
123121
golang.org/x/text v0.3.7 // indirect
124122
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
125123
golang.org/x/tools v0.1.12 // indirect
126124
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
127125
google.golang.org/appengine v1.6.7 // indirect
128-
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect
126+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
129127
google.golang.org/grpc v1.48.0 // indirect
130128
google.golang.org/protobuf v1.28.1 // indirect
131129
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -143,6 +141,6 @@ require (
143141
sigs.k8s.io/yaml v1.3.0 // indirect
144142
)
145143

146-
replace github.com/crossplane/crossplane-runtime => github.com/eljohnson92/crossplane-runtime v0.0.0-20221206010114-b485126ad9f0
144+
replace github.com/crossplane/crossplane-runtime => github.com/eljohnson92/crossplane-runtime v0.0.0-20221208172911-ce686bf20e0c
147145

148146
replace github.com/crossplane/crossplane-tools => github.com/eljohnson92/crossplane-tools v0.0.0-20221206170802-45895cf476c5

0 commit comments

Comments
 (0)