Skip to content

Commit

Permalink
Merge pull request #257 from geekq/fix-warnings
Browse files Browse the repository at this point in the history
Fix warnings for tests and build process
  • Loading branch information
pst authored Dec 9, 2024
2 parents 794bcf6 + eb20281 commit b34d518
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
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
- name: 'Upload terraform-plugins'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: terraform-plugins
path: dist/terraform.d/plugins
Expand All @@ -108,7 +108,7 @@ jobs:
terraform_version: "${{ env.TERRAFORM_VERSION }}"

- name: 'Download terraform-plugins'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: terraform-plugins
path: terraform.d/plugins
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
terraform_version: "${{ env.TERRAFORM_VERSION }}"

- name: 'Download terraform-plugins'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: terraform-plugins
path: terraform.d/plugins
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
cluster_name: ci

- name: 'Download terraform-plugins'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: terraform-plugins
path: terraform.d/plugins
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
terraform_version: "${{ env.TERRAFORM_VERSION }}"

- name: 'Download terraform-plugins'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: terraform-plugins
path: terraform.d/plugins
Expand Down Expand Up @@ -310,7 +310,7 @@ jobs:
run: terraform apply --auto-approve

- name: 'Download terraform-plugins'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: terraform-plugins
path: terraform.d/plugins
Expand All @@ -337,7 +337,7 @@ jobs:
uses: actions/checkout@v3

- name: 'Download terraform-plugins'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: terraform-plugins
path: tests/kubestack-starter-kind/terraform.d/plugins
Expand Down
5 changes: 5 additions & 0 deletions kustomize/data_source_kustomization_overlay_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ output "check" {

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

resource.Test(t, resource.TestCase{
IsUnitTest: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ subjects:
name: admins
apiGroup: rbac.authorization.k8s.io
roleRef:
# invalid roleRef to fail test
# invalid roleRef to fail test - roleRef should reference a ClusterRole, not a Role
kind: Role
name: secret-reader
namespace: default
apiGroup: rbac.authorization.k8s.io

0 comments on commit b34d518

Please sign in to comment.