Skip to content

Commit b34d518

Browse files
authored
Merge pull request #257 from geekq/fix-warnings
Fix warnings for tests and build process
2 parents 794bcf6 + eb20281 commit b34d518

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
cp ./dist/terraform-provider-kustomization_linux_amd64_v1/terraform-provider-kustomization_v* ./dist/terraform.d/plugins/registry.terraform.io/kbst/kustomization/1.0.0/linux_amd64/terraform-provider-kustomization_v1.0.0
8686
8787
- name: 'Upload terraform-plugins'
88-
uses: actions/upload-artifact@v3
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: terraform-plugins
9191
path: dist/terraform.d/plugins
@@ -108,7 +108,7 @@ jobs:
108108
terraform_version: "${{ env.TERRAFORM_VERSION }}"
109109

110110
- name: 'Download terraform-plugins'
111-
uses: actions/download-artifact@v3
111+
uses: actions/download-artifact@v4
112112
with:
113113
name: terraform-plugins
114114
path: terraform.d/plugins
@@ -149,7 +149,7 @@ jobs:
149149
terraform_version: "${{ env.TERRAFORM_VERSION }}"
150150

151151
- name: 'Download terraform-plugins'
152-
uses: actions/download-artifact@v3
152+
uses: actions/download-artifact@v4
153153
with:
154154
name: terraform-plugins
155155
path: terraform.d/plugins
@@ -186,7 +186,7 @@ jobs:
186186
cluster_name: ci
187187

188188
- name: 'Download terraform-plugins'
189-
uses: actions/download-artifact@v3
189+
uses: actions/download-artifact@v4
190190
with:
191191
name: terraform-plugins
192192
path: terraform.d/plugins
@@ -245,7 +245,7 @@ jobs:
245245
terraform_version: "${{ env.TERRAFORM_VERSION }}"
246246

247247
- name: 'Download terraform-plugins'
248-
uses: actions/download-artifact@v3
248+
uses: actions/download-artifact@v4
249249
with:
250250
name: terraform-plugins
251251
path: terraform.d/plugins
@@ -310,7 +310,7 @@ jobs:
310310
run: terraform apply --auto-approve
311311

312312
- name: 'Download terraform-plugins'
313-
uses: actions/download-artifact@v3
313+
uses: actions/download-artifact@v4
314314
with:
315315
name: terraform-plugins
316316
path: terraform.d/plugins
@@ -337,7 +337,7 @@ jobs:
337337
uses: actions/checkout@v3
338338

339339
- name: 'Download terraform-plugins'
340-
uses: actions/download-artifact@v3
340+
uses: actions/download-artifact@v4
341341
with:
342342
name: terraform-plugins
343343
path: tests/kubestack-starter-kind/terraform.d/plugins

kustomize/data_source_kustomization_overlay_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ output "check" {
133133

134134
// Test common_labels attr
135135
func TestDataSourceKustomizationOverlay_commonLabels(t *testing.T) {
136+
// Unfortunately, the controversial commonLabels deprecation
137+
// https://github.com/kubernetes-sigs/kustomize/issues/5436#issuecomment-2442056536
138+
// produces those annoying deprecation warnings. Keep the test until Kustomize
139+
// provides a well-documented alternative that everybody can switch to.
140+
// Then, after some time, we can delete the test for commonLabels.
136141

137142
resource.Test(t, resource.TestCase{
138143
IsUnitTest: true,

kustomize/test_kustomizations/fail_plan_invalid/invalid_cluster_role_binding.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ subjects:
77
name: admins
88
apiGroup: rbac.authorization.k8s.io
99
roleRef:
10-
# invalid roleRef to fail test
10+
# invalid roleRef to fail test - roleRef should reference a ClusterRole, not a Role
1111
kind: Role
1212
name: secret-reader
13-
namespace: default
1413
apiGroup: rbac.authorization.k8s.io

0 commit comments

Comments
 (0)