Skip to content

fix: tke-addon-attach: add tcr example values #771

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 16, 2021
Merged

fix: tke-addon-attach: add tcr example values #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5818d52
fix: tke-addon - add tcr addon example values
Kagashino Dec 14, 2021
769441e
chore: reformat code
Kagashino Dec 14, 2021
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
3 changes: 1 addition & 2 deletions tencentcloud/data_source_tc_kubernetes_charts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ func TestAccTencentCloudKubernetesChartsDataSource(t *testing.T) {
})
}


const testAccDataSourceKubernetesCharts = `
data "tencentcloud_kubernetes_charts" "test" {
}
`
`
2 changes: 1 addition & 1 deletion tencentcloud/extension_tke.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ var TKE_ADDON_DEFAULT_VALUES_KEY = []string{
"global.cluster.clustertype",
"global.cluster.kubeversion",
"global.cluster.kubeminor",
}
}
21 changes: 12 additions & 9 deletions tencentcloud/resource_tc_kubernetes_addon_attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ resource "tencentcloud_kubernetes_addon_attachment" "addon_tcr" {
"global.imagePullSecretsCrs[1].dockerUsername=100012345678",
"global.imagePullSecretsCrs[1].dockerPassword=a.b.tcr-token",
"global.imagePullSecretsCrs[1].dockerServer=sample",
# Specify global hosts
"global.hosts[0].domain=sample-vpc.tencentcloudcr.com",
"global.hosts[0].ip=10.16.0.49",
"global.hosts[0].disabled=false",
]
}
```
Expand Down Expand Up @@ -121,9 +125,9 @@ func resourceTencentCloudTkeAddonAttachment() *schema.Resource {
Description: "Addon response body.",
},
"status": {
Type: schema.TypeMap,
Computed: true,
Description: "Addon current status.",
Type: schema.TypeMap,
Computed: true,
Description: "Addon current status.",
},
},
Create: resourceTencentCloudTkeAddonAttachmentCreate,
Expand Down Expand Up @@ -209,13 +213,12 @@ func resourceTencentCloudTkeAddonAttachmentRead(d *schema.ResourceData, meta int
addonName := split[1]

var (
err error
response string
err error
response string
addonResponseData = &AddonResponseData{}
status = make(map[string]*string)
status = make(map[string]*string)
)


_, has, err = service.PollingAddonsPhase(ctx, clusterId, addonName, addonResponseData)

if err != nil || !has {
Expand Down Expand Up @@ -300,7 +303,7 @@ func resourceTencentCloudTkeAddonAttachmentDelete(d *schema.ResourceData, meta i
split = strings.Split(id, FILED_SP)
clusterId = split[0]
addonName = split[1]
has bool
has bool
)

if err := service.DeleteExtensionAddon(ctx, clusterId, addonName); err != nil {
Expand Down Expand Up @@ -330,4 +333,4 @@ func getFilteredValues(d *schema.ResourceData, values []*string) []string {
rawValues = append(rawValues, *value)
}
return rawValues
}
}
6 changes: 3 additions & 3 deletions tencentcloud/resource_tc_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,9 +993,9 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
Description: "Vpc Id of the cluster.",
},
"cluster_internet": {
Type: schema.TypeBool,
Default: false,
Optional: true,
Type: schema.TypeBool,
Default: false,
Optional: true,
Description: "Open internet access or not." +
" If this field is set 'true', the field below `worker_config` must be set." +
" Because only cluster with node is allowed enable access endpoint.",
Expand Down
8 changes: 4 additions & 4 deletions tencentcloud/resource_tc_redis_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,10 @@ func resourceTencentCloudRedisInstance() *schema.Resource {
Description: "Password for a Redis user, which should be 8 to 16 characters. NOTE: Only `no_auth=true` specified can make password empty.",
},
"no_auth": {
Type: schema.TypeBool,
Optional: true,
ForceNew: true,
Description: "Indicates whether the redis instance support no-auth access. NOTE: Only available in private cloud environment.",
Type: schema.TypeBool,
Optional: true,
ForceNew: true,
Description: "Indicates whether the redis instance support no-auth access. NOTE: Only available in private cloud environment.",
},
"mem_size": {
Type: schema.TypeInt,
Expand Down
4 changes: 4 additions & 0 deletions website/docs/r/kubernetes_addon_attachment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ resource "tencentcloud_kubernetes_addon_attachment" "addon_tcr" {
"global.imagePullSecretsCrs[1].dockerUsername=100012345678",
"global.imagePullSecretsCrs[1].dockerPassword=a.b.tcr-token",
"global.imagePullSecretsCrs[1].dockerServer=sample",
# Specify global hosts
"global.hosts[0].domain=sample-vpc.tencentcloudcr.com",
"global.hosts[0].ip=10.16.0.49",
"global.hosts[0].disabled=false",
]
}
```
Expand Down