Skip to content

Commit

Permalink
Upgrade terraform-provider-rke to v1.4.3 (#197)
Browse files Browse the repository at this point in the history 
This PR was generated via `$ upgrade-provider pulumi/pulumi-rke
--kind=all --target-bridge-version=latest`.

---

- Upgrading terraform-provider-rke from 1.4.2  to 1.4.3.
	Fixes #196
  • Loading branch information
@pulumi-bot
pulumi-bot authored Nov 20, 2023
1 parent 4ac7190 commit 1980f73
Show file tree
Hide file tree
Showing 36 changed files with 556 additions and 272 deletions.
2 changes: 1 addition & 1 deletion provider/cmd/pulumi-resource-rke/schema-embed.json
View file

Large diffs are not rendered by default.

28 changes: 19 additions & 9 deletions provider/cmd/pulumi-resource-rke/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2359,7 +2359,7 @@
"properties": {
"backupConfig": {
"$ref": "#/types/rke:index/ClusterServicesEtcdBackupConfig:ClusterServicesEtcdBackupConfig",
"description": "Backup options for etcd service. Just for Rancher v2.2.x (list maxitems:1)\n"
"description": "Backup options for etcd service. For Rancher v2.2.x and above (list maxitems:1)\n"
},
"caCert": {
"type": "string",
Expand Down Expand Up @@ -2405,7 +2405,7 @@
},
"gid": {
"type": "integer",
"description": "Etcd service GID. Default: `0`. For Rancher v2.3.x or above (int)\n"
"description": "Etcd service GID. Default: `0`. For Rancher v2.3.x and above (int)\n"
},
"image": {
"type": "string",
Expand All @@ -2430,7 +2430,7 @@
},
"uid": {
"type": "integer",
"description": "Etcd service UID. Default: `0`. For Rancher v2.3.x or above (int)\n"
"description": "Etcd service UID. Default: `0`. For Rancher v2.3.x and above (int)\n"
}
},
"type": "object",
Expand Down Expand Up @@ -2521,7 +2521,7 @@
"properties": {
"backupConfig": {
"$ref": "#/types/rke:index/ClusterServicesEtcdDeprecatedBackupConfig:ClusterServicesEtcdDeprecatedBackupConfig",
"description": "Backup options for etcd service. Just for Rancher v2.2.x (list maxitems:1)\n"
"description": "Backup options for etcd service. For Rancher v2.2.x and above (list maxitems:1)\n"
},
"caCert": {
"type": "string",
Expand Down Expand Up @@ -2567,7 +2567,7 @@
},
"gid": {
"type": "integer",
"description": "Etcd service GID. Default: `0`. For Rancher v2.3.x or above (int)\n"
"description": "Etcd service GID. Default: `0`. For Rancher v2.3.x and above (int)\n"
},
"image": {
"type": "string",
Expand All @@ -2592,7 +2592,7 @@
},
"uid": {
"type": "integer",
"description": "Etcd service UID. Default: `0`. For Rancher v2.3.x or above (int)\n"
"description": "Etcd service UID. Default: `0`. For Rancher v2.3.x and above (int)\n"
}
},
"type": "object",
Expand Down Expand Up @@ -2718,6 +2718,10 @@
"type": "string",
"description": "Docker image for scheduler service (string)\n"
},
"podSecurityConfiguration": {
"type": "string",
"description": "Built-in PodSecurityPolicy (privileged or restricted)\n"
},
"podSecurityPolicy": {
"type": "boolean",
"description": "Pod Security Policy option for kube API service (bool)\n"
Expand Down Expand Up @@ -2745,6 +2749,7 @@
"extraBinds",
"extraEnvs",
"image",
"podSecurityConfiguration",
"podSecurityPolicy",
"serviceClusterIpRange",
"serviceNodePortRange"
Expand Down Expand Up @@ -2853,6 +2858,10 @@
"type": "string",
"description": "Docker image for scheduler service (string)\n"
},
"podSecurityConfiguration": {
"type": "string",
"description": "Built-in PodSecurityPolicy (privileged or restricted)\n"
},
"podSecurityPolicy": {
"type": "boolean",
"description": "Pod Security Policy option for kube API service (bool)\n"
Expand Down Expand Up @@ -2880,6 +2889,7 @@
"extraBinds",
"extraEnvs",
"image",
"podSecurityConfiguration",
"podSecurityPolicy",
"serviceClusterIpRange",
"serviceNodePortRange"
Expand Down Expand Up @@ -3815,7 +3825,7 @@
},
"enableCriDockerd": {
"type": "boolean",
"description": "Enable/Disable CRI dockerd for kubelet. Default `false` (bool)\n"
"description": "Enable/Disable CRI dockerd for kubelet; set it to true starting from Kubernetes version 1.24 or later. Default `false` (bool)\n"
},
"etcdHosts": {
"type": "array",
Expand Down Expand Up @@ -4078,7 +4088,7 @@
},
"enableCriDockerd": {
"type": "boolean",
"description": "Enable/Disable CRI dockerd for kubelet. Default `false` (bool)\n"
"description": "Enable/Disable CRI dockerd for kubelet; set it to true starting from Kubernetes version 1.24 or later. Default `false` (bool)\n"
},
"ignoreDockerVersion": {
"type": "boolean",
Expand Down Expand Up @@ -4315,7 +4325,7 @@
},
"enableCriDockerd": {
"type": "boolean",
"description": "Enable/Disable CRI dockerd for kubelet. Default `false` (bool)\n"
"description": "Enable/Disable CRI dockerd for kubelet; set it to true starting from Kubernetes version 1.24 or later. Default `false` (bool)\n"
},
"etcdHosts": {
"type": "array",
Expand Down
80 changes: 39 additions & 41 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21
require (
github.com/pulumi/pulumi-terraform-bridge/v3 v3.65.0
github.com/pulumi/pulumi/sdk/v3 v3.93.0
github.com/rancher/terraform-provider-rke v1.4.2
github.com/rancher/terraform-provider-rke v1.4.3
)

require (
Expand Down Expand Up @@ -39,8 +39,6 @@ require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/hcsshim v0.9.6 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
Expand All @@ -67,6 +65,7 @@ require (
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
Expand All @@ -79,34 +78,34 @@ require (
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
github.com/containerd/containerd v1.6.18 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/djherbis/times v1.5.0 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v20.10.24+incompatible // indirect
github.com/docker/docker v20.10.25+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/ettle/strcase v0.1.1 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.9.0 // indirect
github.com/go-ini/ini v1.37.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.6 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
Expand Down Expand Up @@ -188,7 +187,7 @@ require (
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/mount v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
Expand All @@ -201,7 +200,7 @@ require (
github.com/oklog/run v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/opencontainers/runc v1.1.9 // indirect
github.com/opentracing/basictracer-go v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
Expand All @@ -212,24 +211,23 @@ require (
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/posener/complete v1.2.3 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/pulumi/esc v0.5.7-0.20231030195049-f71961c0d5fa // indirect
github.com/pulumi/pulumi-java/pkg v0.9.8 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 // indirect
github.com/pulumi/pulumi-yaml v1.4.0 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.93.0 // indirect
github.com/pulumi/schema-tools v0.1.2 // indirect
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
github.com/rancher/lasso v0.0.0-20221202205459-e7138f16489c // indirect
github.com/rancher/norman v0.0.0-20221205184727-32ef2e185b99 // indirect
github.com/rancher/rke v1.4.6 // indirect
github.com/rancher/wrangler v1.0.1-0.20221202234327-1cafffeaa9a1 // indirect
github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 // indirect
github.com/rancher/norman v0.0.0-20230831160711-5de27f66385d // indirect
github.com/rancher/rke v1.4.11 // indirect
github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
Expand All @@ -239,7 +237,7 @@ require (
github.com/segmentio/encoding v0.3.5 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/skeema/knownhosts v1.2.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.0 // indirect
Expand All @@ -262,10 +260,10 @@ require (
github.com/xlab/treeprint v1.1.0 // indirect
github.com/zclconf/go-cty v1.14.0 // indirect
github.com/zclconf/go-cty-yaml v1.0.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/v2 v2.305.4 // indirect
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.opencensus.io v0.24.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/atomic v1.9.0 // indirect
Expand All @@ -277,7 +275,7 @@ require (
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
Expand All @@ -297,22 +295,22 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.25.4 // indirect
k8s.io/apimachinery v0.25.4 // indirect
k8s.io/apiserver v0.25.4 // indirect
k8s.io/cli-runtime v0.25.4 // indirect
k8s.io/client-go v0.25.4 // indirect
k8s.io/component-base v0.25.4 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/kubectl v0.25.4 // indirect
k8s.io/kubernetes v1.13.0 // indirect
k8s.io/pod-security-admission v0.25.4 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
k8s.io/api v0.27.6 // indirect
k8s.io/apimachinery v0.27.6 // indirect
k8s.io/apiserver v0.27.6 // indirect
k8s.io/cli-runtime v0.27.6 // indirect
k8s.io/client-go v0.27.6 // indirect
k8s.io/component-base v0.27.6 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/kubectl v0.27.6 // indirect
k8s.io/kubernetes v1.27.6 // indirect
k8s.io/pod-security-admission v0.27.6 // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
lukechampine.com/frand v1.4.2 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kustomize/api v0.12.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 // indirect
Expand Down
Loading

0 comments on commit 1980f73

Please sign in to comment.