From 2d955a2d2260afafe2b92ba4c1b5ab42844148ff Mon Sep 17 00:00:00 2001 From: janardhan-rafay Date: Wed, 30 Jul 2025 00:46:45 +0530 Subject: [PATCH] RC-42710 Docs update --- docs/resources/import_cluster.md | 18 ++++++++++++++++++ .../resources/rafay_import_cluster/resource.tf | 10 ++++++++++ go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/docs/resources/import_cluster.md b/docs/resources/import_cluster.md index ef7b65e5..73b45301 100644 --- a/docs/resources/import_cluster.md +++ b/docs/resources/import_cluster.md @@ -28,6 +28,16 @@ resource "rafay_import_cluster" "import_cluster" { } kubernetes_provider = "AKS" provision_environment = "CLOUD" + + proxy_config { + http_proxy = "http://10.100.0.10:8080/" + https_proxy = "http://10.100.0.10:8080/" + no_proxy = "10.0.0.0/16,localhost,127.0.0.1,internal-service.svc,webhook.svc,10.100.0.0/24,custom-dns.example.com,10.200.0.0/16,10.101.0.0/12,169.254.169.254,.internal.example.com,168.63.129.16,proxy,master.service.consul,10.240.0.0/16,drift-service.svc,*.privatelink.example.com,.privatelink.example.com" + enabled = true + proxy_auth = "username:password" + allow_insecure_bootstrap = false + bootstrap_ca = "" + } } output "values_data" { @@ -66,6 +76,14 @@ output "bootstrap_path" { - `provision_environment` (String) This field is used to define the type of environment. The supported values are `CLOUD` and `ONPREM` - `values_path` - (String) The path to save the `values.yaml` file to. This is an optional parameter. If path is provided values.yaml will be downloaded to that path. Otherwise values.yaml will be downloaded to current directory and this output variable will be populated with path to the downloaded file. - `bootstrap_path` - (String) The path to save the `bootstrap.yaml` file to. This is an optional parameter. If path is provided bootstrap.yaml will be downloaded to that path. Otherwise bootstrap.yaml will be downloaded to current directory and this output variable will be populated with path to the downloaded file. +- `proxy_config` - (Block, Optional) Proxy configuration for the cluster. Only one block can be specified. The following attributes are supported: + - `http_proxy` - (String, Optional) HTTP proxy URL. + - `https_proxy` - (String, Optional) HTTPS proxy URL. + - `no_proxy` - (String, Optional) Comma-separated list of hosts that should bypass the proxy. + - `enabled` - (Boolean, Optional) Whether proxy is enabled. + - `proxy_auth` - (String, Optional) Proxy authentication string. + - `allow_insecure_bootstrap` - (Boolean, Optional) Allow insecure bootstrap. + - `bootstrap_ca` - (String, Optional) CA certificate for bootstrap. - `timeouts` - (Block) Sets the duration of time the create, delete, and update functions are allowed to run. If the function takes longer than this, it is assumed the function has failed. The default is 10 minutes. (See [below for nested schema](#nestedblock--timeouts)) diff --git a/examples/resources/rafay_import_cluster/resource.tf b/examples/resources/rafay_import_cluster/resource.tf index bf8b9a3d..6d544b3d 100644 --- a/examples/resources/rafay_import_cluster/resource.tf +++ b/examples/resources/rafay_import_cluster/resource.tf @@ -12,6 +12,16 @@ resource "rafay_import_cluster" "import_cluster" { } kubernetes_provider = "AKS" provision_environment = "CLOUD" + + proxy_config { + http_proxy = "http://10.100.0.10:8080/" + https_proxy = "http://10.100.0.10:8080/" + no_proxy = "10.0.0.0/16,localhost,127.0.0.1,internal-service.svc,webhook.svc,10.100.0.0/24,custom-dns.example.com,10.200.0.0/16,10.101.0.0/12,169.254.169.254,.internal.example.com,168.63.129.16,proxy,master.service.consul,10.240.0.0/16,drift-service.svc,*.privatelink.example.com,.privatelink.example.com" + enabled = true + proxy_auth = "username:password" + allow_insecure_bootstrap = false + bootstrap_ca = "" + } } output "values_data" { diff --git a/go.mod b/go.mod index e535b592..830bf2ca 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ toolchain go1.23.4 require ( github.com/RafaySystems/edge-common v1.24.1-0.20240905053610-494a83a439f8 - github.com/RafaySystems/rafay-common v1.29.1-rc2.0.20250826035636-c2db98684108 - github.com/RafaySystems/rctl v1.29.1-0.20250826082044-368db2bdc79d + github.com/RafaySystems/rafay-common v1.29.1-rc2.0.20250912050905-22b524e069d3 + github.com/RafaySystems/rctl v1.29.1-0.20251009073106-3a01a70d5f7f github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/go-yaml/yaml v2.1.0+incompatible github.com/goccy/go-yaml v1.9.5 diff --git a/go.sum b/go.sum index 7e36cdb6..f572d7b6 100644 --- a/go.sum +++ b/go.sum @@ -22,10 +22,10 @@ github.com/RafaySystems/edge-common v1.24.1-0.20240905053610-494a83a439f8 h1:Pce github.com/RafaySystems/edge-common v1.24.1-0.20240905053610-494a83a439f8/go.mod h1:5mRn2xN25Y8mpObHyOwDB3OLudeuglzHTQX9IiNHxhM= github.com/RafaySystems/paas-common v0.0.0-20250407132001-0d707c610b95 h1:3z1arMhSoXGTwtYV8jFGsfJh/IhjaZ8X1exoXHSc5oc= github.com/RafaySystems/paas-common v0.0.0-20250407132001-0d707c610b95/go.mod h1:vDR0S28Q+hwE/5wO0L/Ohn9CZwaI/o2QuPupJ2iLI7k= -github.com/RafaySystems/rafay-common v1.29.1-rc2.0.20250826035636-c2db98684108 h1:Vyfu6YNwuBUpGz8XYnaGlqkRoeM198xkJRZOZDIhtzI= -github.com/RafaySystems/rafay-common v1.29.1-rc2.0.20250826035636-c2db98684108/go.mod h1:NozE55WdAl4Td8+GMPxbRN/qI5tu8tkPBH/hj8aZqSE= -github.com/RafaySystems/rctl v1.29.1-0.20250826082044-368db2bdc79d h1:Gdo9PakiEVg10mepA2TJXHFzIAZWxHnQgEJxVz5t6zU= -github.com/RafaySystems/rctl v1.29.1-0.20250826082044-368db2bdc79d/go.mod h1:d3etQNChhAuiW86c3k+7s33z4smy94OkOMclt2OoHRs= +github.com/RafaySystems/rafay-common v1.29.1-rc2.0.20250912050905-22b524e069d3 h1:Pt2M19OSaK3FtZMMPOUG3ZGfIulYVeT0Sh5NoplWe48= +github.com/RafaySystems/rafay-common v1.29.1-rc2.0.20250912050905-22b524e069d3/go.mod h1:NozE55WdAl4Td8+GMPxbRN/qI5tu8tkPBH/hj8aZqSE= +github.com/RafaySystems/rctl v1.29.1-0.20251009073106-3a01a70d5f7f h1:D14avgXPoI7B3rRYwynLJiE3BxzgMVejIUl9SvcvWcE= +github.com/RafaySystems/rctl v1.29.1-0.20251009073106-3a01a70d5f7f/go.mod h1:tn0SlvXgdHfrVBeoe4wCwmhW30+zw8b1efp9uSTKWPY= github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ= github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= github.com/abhay-krishna/cluster-api v1.4.2-eksa.1 h1:mO+idOdh9Bpumgo41WJcrASPtJGSgmRxHNiwtUdUa+E=