diff --git a/pkg/kotsadm/types/constants.go b/pkg/kotsadm/types/constants.go index fccdb4fb07..4f65b299df 100644 --- a/pkg/kotsadm/types/constants.go +++ b/pkg/kotsadm/types/constants.go @@ -13,7 +13,7 @@ const ExcludeValue = "true" const BackupLabel = "kots.io/backup" const BackupLabelValue = "velero" -const TroubleshootKey = "troubleshoot.io/kind" +const TroubleshootKey = "troubleshoot.sh/kind" const TroubleshootValue = "support-bundle" const DefaultSupportBundleSpecKey = "default" diff --git a/pkg/kotsadm/types/constants_test.go b/pkg/kotsadm/types/constants_test.go index 01ec73a84e..296d998a9f 100644 --- a/pkg/kotsadm/types/constants_test.go +++ b/pkg/kotsadm/types/constants_test.go @@ -49,7 +49,7 @@ func Test_getTroubleshootLabels(t *testing.T) { }, }, expectLabels: map[string]string{ - "troubleshoot.io/kind": "support-bundle", + "troubleshoot.sh/kind": "support-bundle", "foo": "foo", }, }, @@ -97,7 +97,7 @@ func Test_mergeLabels(t *testing.T) { expectLabels: map[string]string{ "kots.io/kotsadm": "true", "kots.io/backup": "velero", - "troubleshoot.io/kind": "support-bundle", + "troubleshoot.sh/kind": "support-bundle", }, }, { @@ -111,7 +111,7 @@ func Test_mergeLabels(t *testing.T) { "bar": "bar", "kots.io/kotsadm": "true", "kots.io/backup": "velero", - "troubleshoot.io/kind": "support-bundle", + "troubleshoot.sh/kind": "support-bundle", }, }, } diff --git a/pkg/supportbundle/spec_test.go b/pkg/supportbundle/spec_test.go index 5224228b09..89918af8fb 100644 --- a/pkg/supportbundle/spec_test.go +++ b/pkg/supportbundle/spec_test.go @@ -664,7 +664,7 @@ func Test_findSupportBundleSecrets(t *testing.T) { Namespace: "kotsadm", Labels: map[string]string{ "foo": "bar", - "troubleshoot.io/kind": "support-bundle", + "troubleshoot.sh/kind": "support-bundle", }, }, Data: map[string][]byte{ @@ -677,7 +677,7 @@ func Test_findSupportBundleSecrets(t *testing.T) { Namespace: "another", Labels: map[string]string{ "foo": "bar", - "troubleshoot.io/kind": "support-bundle", + "troubleshoot.sh/kind": "support-bundle", }, }, Data: map[string]string{ @@ -690,7 +690,7 @@ func Test_findSupportBundleSecrets(t *testing.T) { Namespace: "kotsadm", Labels: map[string]string{ "foo": "bar", - "troubleshoot.io/kind": "support-bundle", + "troubleshoot.sh/kind": "support-bundle", }, }, Data: map[string][]byte{ @@ -708,7 +708,7 @@ func Test_findSupportBundleSecrets(t *testing.T) { Name: "kotsadm-my-app-supportbundle", Namespace: "kotsadm", Labels: map[string]string{ - "troubleshoot.io/kind": "support-bundle", + "troubleshoot.sh/kind": "support-bundle", }, }, Data: map[string][]byte{ @@ -720,7 +720,7 @@ func Test_findSupportBundleSecrets(t *testing.T) { Name: "cluster-wide-supportbundle", Namespace: "default", Labels: map[string]string{ - "troubleshoot.io/kind": "support-bundle", + "troubleshoot.sh/kind": "support-bundle", }, }, }, diff --git a/pkg/tests/kotsutil/cases/multiple-preflights-in-helm-chart/rendered/this-cluster/helm/my-app/all.yaml b/pkg/tests/kotsutil/cases/multiple-preflights-in-helm-chart/rendered/this-cluster/helm/my-app/all.yaml index 5269910d9a..c9245e9a22 100644 --- a/pkg/tests/kotsutil/cases/multiple-preflights-in-helm-chart/rendered/this-cluster/helm/my-app/all.yaml +++ b/pkg/tests/kotsutil/cases/multiple-preflights-in-helm-chart/rendered/this-cluster/helm/my-app/all.yaml @@ -176,7 +176,7 @@ metadata: app.kubernetes.io/instance: release-name app.kubernetes.io/version: "1.27.0" app.kubernetes.io/managed-by: Helm - troubleshoot.io/kind: preflight + troubleshoot.sh/kind: preflight annotations: "helm.sh/hook": pre-install, pre-upgrade "helm.sh/hook-weight": "-6" @@ -221,7 +221,7 @@ metadata: app.kubernetes.io/instance: release-name app.kubernetes.io/version: "1.27.0" app.kubernetes.io/managed-by: Helm - troubleshoot.io/kind: preflight + troubleshoot.sh/kind: preflight annotations: "helm.sh/hook": pre-install, pre-upgrade "helm.sh/hook-weight": "-6" diff --git a/pkg/tests/kotsutil/cases/preflights-in-helm-chart/rendered/this-cluster/helm/my-app/all.yaml b/pkg/tests/kotsutil/cases/preflights-in-helm-chart/rendered/this-cluster/helm/my-app/all.yaml index f686420f82..a1f713d185 100644 --- a/pkg/tests/kotsutil/cases/preflights-in-helm-chart/rendered/this-cluster/helm/my-app/all.yaml +++ b/pkg/tests/kotsutil/cases/preflights-in-helm-chart/rendered/this-cluster/helm/my-app/all.yaml @@ -176,7 +176,7 @@ metadata: app.kubernetes.io/instance: release-name app.kubernetes.io/version: "1.27.0" app.kubernetes.io/managed-by: Helm - troubleshoot.io/kind: preflight + troubleshoot.sh/kind: preflight annotations: "helm.sh/hook": pre-install, pre-upgrade "helm.sh/hook-weight": "-6"