diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/base/kustomization.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/base/kustomization.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/base/kustomization.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/base/kustomization.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/base/subdir/configmap.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/base/subdir/configmap.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/base/subdir/configmap.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/base/subdir/configmap.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/kotsKinds/config.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/config.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/kotsKinds/config.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/config.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/upstream/userdata/config.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/userdata/config.yaml similarity index 79% rename from pkg/tests/renderdir/cases/simple/wantResults/upstream/userdata/config.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/userdata/config.yaml index 4b2800d1ad..0e4a32e830 100644 --- a/pkg/tests/renderdir/cases/simple/wantResults/upstream/userdata/config.yaml +++ b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/userdata/config.yaml @@ -6,5 +6,5 @@ metadata: spec: values: hostname: - value: my-app.somebigbank.com + value: old-my-app.somebigbank.com status: {} diff --git a/pkg/tests/renderdir/cases/simple/wantResults/upstream/userdata/installation.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/userdata/installation.yaml similarity index 63% rename from pkg/tests/renderdir/cases/simple/wantResults/upstream/userdata/installation.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/userdata/installation.yaml index b0c5471181..03f635036a 100644 --- a/pkg/tests/renderdir/cases/simple/wantResults/upstream/userdata/installation.yaml +++ b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/userdata/installation.yaml @@ -4,6 +4,6 @@ metadata: creationTimestamp: null name: replicated-kots-app spec: - channelID: 1vusIYZLAVxMG6q760OJmRKj5i5 - channelName: My Channel + channelID: old-1vusIYZLAVxMG6q760OJmRKj5i5 + channelName: Old My Channel status: {} diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/kotsKinds/userdata/license.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/userdata/license.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/kotsKinds/userdata/license.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/kotsKinds/userdata/license.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/overlays/downstreams/this-cluster/kustomization.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/overlays/downstreams/this-cluster/kustomization.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/overlays/downstreams/this-cluster/kustomization.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/overlays/downstreams/this-cluster/kustomization.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/overlays/midstream/backup-label-transformer.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/overlays/midstream/backup-label-transformer.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/overlays/midstream/backup-label-transformer.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/overlays/midstream/backup-label-transformer.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/overlays/midstream/kustomization.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/overlays/midstream/kustomization.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/overlays/midstream/kustomization.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/overlays/midstream/kustomization.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/overlays/midstream/secret.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/overlays/midstream/secret.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/overlays/midstream/secret.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/overlays/midstream/secret.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/rendered/this-cluster/kotsadm-replicated-registry-secret.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/rendered/this-cluster/kotsadm-replicated-registry-secret.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/rendered/this-cluster/kotsadm-replicated-registry-secret.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/rendered/this-cluster/kotsadm-replicated-registry-secret.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/rendered/this-cluster/my-app-registry-secret.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/rendered/this-cluster/my-app-registry-secret.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/rendered/this-cluster/my-app-registry-secret.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/rendered/this-cluster/my-app-registry-secret.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/rendered/this-cluster/test-licenseinfo-configmap.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/rendered/this-cluster/test-licenseinfo-configmap.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/rendered/this-cluster/test-licenseinfo-configmap.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/rendered/this-cluster/test-licenseinfo-configmap.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/upstream/config.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/config.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/upstream/config.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/config.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/upstream/subdir/configmap.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/subdir/configmap.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/upstream/subdir/configmap.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/subdir/configmap.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/kotsKinds/userdata/config.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/userdata/config.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/kotsKinds/userdata/config.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/userdata/config.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/kotsKinds/userdata/installation.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/userdata/installation.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/kotsKinds/userdata/installation.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/userdata/installation.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/upstream/userdata/license.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/userdata/license.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/upstream/userdata/license.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/archiveDir/upstream/userdata/license.yaml diff --git a/pkg/tests/renderdir/cases/simple/testcase.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/testcase.yaml similarity index 57% rename from pkg/tests/renderdir/cases/simple/testcase.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/testcase.yaml index e84298ca5a..3d61cfa465 100644 --- a/pkg/tests/renderdir/cases/simple/testcase.yaml +++ b/pkg/tests/renderdir/cases/outdated-kotskinds/testcase.yaml @@ -1,6 +1,6 @@ -Name: test simple renderdir +Name: test outdated kots kinds RenderDirOptions: - ArchiveDir: cases/simple/archiveDir + ArchiveDir: cases/outdated-kotskinds/archiveDir App: ID: app-id Slug: my-app diff --git a/pkg/tests/renderdir/cases/simple/wantResults/base/kustomization.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/base/kustomization.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/base/kustomization.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/base/kustomization.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/base/subdir/configmap.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/base/subdir/configmap.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/base/subdir/configmap.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/base/subdir/configmap.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/kotsKinds/config.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/kotsKinds/config.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/kotsKinds/config.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/kotsKinds/config.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/upstream/userdata/config.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/kotsKinds/userdata/config.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/upstream/userdata/config.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/kotsKinds/userdata/config.yaml diff --git a/pkg/tests/renderdir/cases/simple/archiveDir/upstream/userdata/installation.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/kotsKinds/userdata/installation.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/archiveDir/upstream/userdata/installation.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/kotsKinds/userdata/installation.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/kotsKinds/userdata/license.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/kotsKinds/userdata/license.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/kotsKinds/userdata/license.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/kotsKinds/userdata/license.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/overlays/downstreams/this-cluster/kustomization.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/overlays/downstreams/this-cluster/kustomization.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/overlays/downstreams/this-cluster/kustomization.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/overlays/downstreams/this-cluster/kustomization.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/overlays/midstream/backup-label-transformer.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/overlays/midstream/backup-label-transformer.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/overlays/midstream/backup-label-transformer.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/overlays/midstream/backup-label-transformer.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/overlays/midstream/kustomization.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/overlays/midstream/kustomization.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/overlays/midstream/kustomization.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/overlays/midstream/kustomization.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/overlays/midstream/secret.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/overlays/midstream/secret.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/overlays/midstream/secret.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/overlays/midstream/secret.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/rendered/this-cluster/kotsadm-replicated-registry-secret.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/rendered/this-cluster/kotsadm-replicated-registry-secret.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/rendered/this-cluster/kotsadm-replicated-registry-secret.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/rendered/this-cluster/kotsadm-replicated-registry-secret.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/rendered/this-cluster/my-app-registry-secret.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/rendered/this-cluster/my-app-registry-secret.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/rendered/this-cluster/my-app-registry-secret.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/rendered/this-cluster/my-app-registry-secret.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/rendered/this-cluster/test-licenseinfo-configmap.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/rendered/this-cluster/test-licenseinfo-configmap.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/rendered/this-cluster/test-licenseinfo-configmap.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/rendered/this-cluster/test-licenseinfo-configmap.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/upstream/config.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/config.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/upstream/config.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/config.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/upstream/subdir/configmap.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/subdir/configmap.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/upstream/subdir/configmap.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/subdir/configmap.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/kotsKinds/userdata/config.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/userdata/config.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/kotsKinds/userdata/config.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/userdata/config.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/kotsKinds/userdata/installation.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/userdata/installation.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/kotsKinds/userdata/installation.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/userdata/installation.yaml diff --git a/pkg/tests/renderdir/cases/simple/wantResults/upstream/userdata/license.yaml b/pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/userdata/license.yaml similarity index 100% rename from pkg/tests/renderdir/cases/simple/wantResults/upstream/userdata/license.yaml rename to pkg/tests/renderdir/cases/outdated-kotskinds/wantResults/upstream/userdata/license.yaml