diff --git a/apis/instance/v1alpha1/zz_instance_terraformed.go b/apis/instance/v1alpha1/zz_instance_terraformed.go index 137dd45..241b808 100755 --- a/apis/instance/v1alpha1/zz_instance_terraformed.go +++ b/apis/instance/v1alpha1/zz_instance_terraformed.go @@ -120,6 +120,7 @@ func (tr *Instance) LateInitialize(attrs []byte) (bool, error) { opts := []resource.GenericLateInitializerOption{resource.WithZeroValueJSONOmitEmptyFilter(resource.CNameWildcard)} opts = append(opts, resource.WithNameFilter("Config")) opts = append(opts, resource.WithNameFilter("Disk")) + opts = append(opts, resource.WithNameFilter("IPv4")) li := resource.NewGenericLateInitializer(opts...) return li.LateInitialize(&tr.Spec.ForProvider, params) diff --git a/config/instance/config.go b/config/instance/config.go index da67354..0f57d27 100644 --- a/config/instance/config.go +++ b/config/instance/config.go @@ -9,8 +9,9 @@ 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"}, + IgnoredFields: []string{"disk", "config", "ipv4"}, } r.References["stackscript_id"] = config.Reference{ diff --git a/docs/developer.md b/docs/developer.md index 10d5775..21faf51 100644 --- a/docs/developer.md +++ b/docs/developer.md @@ -74,8 +74,10 @@ type: Opaque 5. Test changes locally with `make local-deploy` - create a manifest for your resource and test that it works. ### Debugging using dlv: -1. use `make run` to run the provider locally -2. `dlv attach ` to begin a debug session +1. `make controlplane.up` - will start a kind cluster with everything needed +2. `make generate` to generate crd's and other generated code +3. `k apply -f package/crds` to install CRDs +4. use `make debug` to run the provider locally ### Creating and publishing xpkgs @@ -90,4 +92,4 @@ type: Opaque up xpkg push tchinmai7/provider-linode:v0.0.1 -f _output/xpkg/linux_amd64/provider-linode-v0.0.0-130.g7bacec4.xpkg ``` the version HAS to be a semver -8. modify your provider package to use this version instead. \ No newline at end of file +8. modify your provider package to use this version instead. diff --git a/go.mod b/go.mod index ee2d3fb..4534077 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,7 @@ go 1.23.0 toolchain go1.24.2 -replace ( - github.com/crossplane/crossplane-runtime => github.com/guilhem/crossplane-runtime v1.16.1-0.20250116161626-a92ea4102aa4 - github.com/linode/terraform-provider-linode/v2 => github.com/tchinmai7/terraform-provider-linode/v2 v2.37.1-0.20250410211733-1b24dfd5b938 -) +replace github.com/crossplane/crossplane-runtime => github.com/guilhem/crossplane-runtime v1.16.1-0.20250116161626-a92ea4102aa4 require ( dario.cat/mergo v1.0.0 diff --git a/go.sum b/go.sum index b7d5546..bbcba54 100644 --- a/go.sum +++ b/go.sum @@ -238,6 +238,8 @@ github.com/linode/linodego v1.49.0 h1:MNd3qwvQzbXB5mCpvdCqlUIu1RPA9oC+50LyB9kK+G github.com/linode/linodego v1.49.0/go.mod h1:B+HAM3//4w1wOS0BwdaQBKwBxlfe6kYJ7bSC6jJ/xtc= github.com/linode/linodego/k8s v1.25.2 h1:PY6S0sAD3xANVvM9WY38bz9GqMTjIbytC8IJJ9Cv23o= github.com/linode/linodego/k8s v1.25.2/go.mod h1:DC1XCSRZRGsmaa/ggpDPSDUmOM6aK1bhSIP6+f9Cwhc= +github.com/linode/terraform-provider-linode/v2 v2.37.0 h1:mVADbhJ9s9fGfQJFXEeVheTjg64Se0waZ78Qu8A09as= +github.com/linode/terraform-provider-linode/v2 v2.37.0/go.mod h1:Th2/ECI4q9Ivq3OeQXR0Wui1E5JEPcZNGZRbxNb0GPE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -319,8 +321,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tchinmai7/terraform-provider-linode/v2 v2.37.1-0.20250410211733-1b24dfd5b938 h1:CbRKtIBHeYc9a6Ko1lxRLtUi/F9XCHcSZR8C1xA/xBI= -github.com/tchinmai7/terraform-provider-linode/v2 v2.37.1-0.20250410211733-1b24dfd5b938/go.mod h1:Th2/ECI4q9Ivq3OeQXR0Wui1E5JEPcZNGZRbxNb0GPE= github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ= github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=