Merge pull request #1540 from tjkirch/archive-old-migrations

Archive old migrations
bottlerocket-os · Apr 30, 2021 · bc364dd · bc364dd
2 parents 2587bda + f5a48c5
commit bc364dd
Show file tree

Hide file tree

Showing 61 changed files with 2 additions and 234 deletions.
diff --git a/packages/os/os.spec b/packages/os/os.spec
@@ -242,7 +242,7 @@ mkdir bin
 # For static builds, first we find the migrations in the source tree.  We assume the directory name
 # is the same as the crate name.
 migrations=()
-for migration in $(find %{_builddir}/sources/api/migration/migrations/* -mindepth 1 -maxdepth 1 -type d); do
+for migration in $(find %{_builddir}/sources/api/migration/migrations/v[0-9]* -mindepth 1 -maxdepth 1 -type d); do
     migrations+=("-p $(basename ${migration})")
 done
 # Store the output so we can print it after waiting for the backgrounded job.
@@ -327,7 +327,7 @@ for p in growpart ; do
 done
 
 install -d %{buildroot}%{_cross_datadir}/migrations
-for version_path in %{_builddir}/sources/api/migration/migrations/*; do
+for version_path in %{_builddir}/sources/api/migration/migrations/v[0-9]*; do
   [ -e "${version_path}" ] || continue
   for migration_path in "${version_path}"/*; do
     [ -e "${migration_path}" ] || continue

diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
@@ -24,35 +24,6 @@ members = [
     "api/shibaken",
 
     # "api/migration/migrations/vX.Y.Z/...
-    "api/migration/migrations/v0.3.2/migrate-admin-container-v0-5-0",
-    "api/migration/migrations/v0.4.1/add-version-lock-ignore-waves",
-    "api/migration/migrations/v0.4.1/pivot-repo-2020-07-07",
-    "api/migration/migrations/v0.5.0/migrate-admin-container-v0-5-2",
-    "api/migration/migrations/v0.5.0/migrate-control-container-v0-4-1",
-    "api/migration/migrations/v0.5.0/add-cluster-domain",
-    "api/migration/migrations/v1.0.0/ecr-helper-admin",
-    "api/migration/migrations/v1.0.0/ecr-helper-control",
-    "api/migration/migrations/v1.0.2/add-enable-spot-instance-draining",
-    "api/migration/migrations/v1.0.3/add-sysctl",
-    "api/migration/migrations/v1.0.5/add-lockdown",
-    "api/migration/migrations/v1.0.5/sysctl-subcommand",
-    "api/migration/migrations/v1.0.5/add-user-data",
-    "api/migration/migrations/v1.0.5/add-network-settings",
-    "api/migration/migrations/v1.0.5/add-proxy-restart",
-    "api/migration/migrations/v1.0.5/add-proxy-services",
-    "api/migration/migrations/v1.0.6/metricdog-init",
-    "api/migration/migrations/v1.0.6/add-static-pods",
-    "api/migration/migrations/v1.0.6/kubelet-standalone-tls-settings",
-    "api/migration/migrations/v1.0.6/kubelet-standalone-tls-services",
-    "api/migration/migrations/v1.0.6/control-container-v0-4-2",
-    "api/migration/migrations/v1.0.6/add-shibaken",
-    "api/migration/migrations/v1.0.6/admin-container-v0-6-0",
-    "api/migration/migrations/v1.0.8/kubelet-eviction-hard",
-    "api/migration/migrations/v1.0.8/kubelet-unsafe-sysctl-kube-reserved",
-    "api/migration/migrations/v1.0.8/proxy-affect-host-containers",
-    "api/migration/migrations/v1.0.8/control-container-v0-5-0",
-    "api/migration/migrations/v1.0.8/admin-container-v0-7-0",
-    "api/migration/migrations/v1.0.8/add-bootstrap-containers",
     "api/migration/migrations/v1.1.0/kubelet-server-tls-bootstrap",
     "api/migration/migrations/v1.1.0/kubelet-cloud-provider",
     "api/migration/migrations/v1.1.0/kubelet-registry-qps-registry-burst",

diff --git a/...migrate-admin-container-v0-5-0/Cargo.toml → ...migrate-admin-container-v0-5-0/Cargo.toml b/...migrate-admin-container-v0-5-0/Cargo.toml → ...migrate-admin-container-v0-5-0/Cargo.toml
diff --git a/...igrate-admin-container-v0-5-0/src/main.rs → ...igrate-admin-container-v0-5-0/src/main.rs b/...igrate-admin-container-v0-5-0/src/main.rs → ...igrate-admin-container-v0-5-0/src/main.rs
diff --git a/.../add-version-lock-ignore-waves/Cargo.toml → .../add-version-lock-ignore-waves/Cargo.toml b/.../add-version-lock-ignore-waves/Cargo.toml → .../add-version-lock-ignore-waves/Cargo.toml
diff --git a/...add-version-lock-ignore-waves/src/main.rs → ...add-version-lock-ignore-waves/src/main.rs b/...add-version-lock-ignore-waves/src/main.rs → ...add-version-lock-ignore-waves/src/main.rs
diff --git a/...s/v0.4.1/pivot-repo-2020-07-07/Cargo.toml → ...d/v0.4.1/pivot-repo-2020-07-07/Cargo.toml b/...s/v0.4.1/pivot-repo-2020-07-07/Cargo.toml → ...d/v0.4.1/pivot-repo-2020-07-07/Cargo.toml
diff --git a/.../v0.4.1/pivot-repo-2020-07-07/src/main.rs → .../v0.4.1/pivot-repo-2020-07-07/src/main.rs b/.../v0.4.1/pivot-repo-2020-07-07/src/main.rs → .../v0.4.1/pivot-repo-2020-07-07/src/main.rs
diff --git a/...ions/v0.5.0/add-cluster-domain/Cargo.toml → ...ived/v0.5.0/add-cluster-domain/Cargo.toml b/...ions/v0.5.0/add-cluster-domain/Cargo.toml → ...ived/v0.5.0/add-cluster-domain/Cargo.toml
diff --git a/...ons/v0.5.0/add-cluster-domain/src/main.rs → ...ved/v0.5.0/add-cluster-domain/src/main.rs b/...ons/v0.5.0/add-cluster-domain/src/main.rs → ...ved/v0.5.0/add-cluster-domain/src/main.rs
diff --git a/...migrate-admin-container-v0-5-2/Cargo.toml → ...migrate-admin-container-v0-5-2/Cargo.toml b/...migrate-admin-container-v0-5-2/Cargo.toml → ...migrate-admin-container-v0-5-2/Cargo.toml
diff --git a/...igrate-admin-container-v0-5-2/src/main.rs → ...igrate-admin-container-v0-5-2/src/main.rs b/...igrate-admin-container-v0-5-2/src/main.rs → ...igrate-admin-container-v0-5-2/src/main.rs
diff --git a/...grate-control-container-v0-4-1/Cargo.toml → ...grate-control-container-v0-4-1/Cargo.toml b/...grate-control-container-v0-4-1/Cargo.toml → ...grate-control-container-v0-4-1/Cargo.toml
diff --git a/...rate-control-container-v0-4-1/src/main.rs → ...rate-control-container-v0-4-1/src/main.rs b/...rate-control-container-v0-4-1/src/main.rs → ...rate-control-container-v0-4-1/src/main.rs
diff --git a/...ations/v1.0.0/ecr-helper-admin/Cargo.toml → ...chived/v1.0.0/ecr-helper-admin/Cargo.toml b/...ations/v1.0.0/ecr-helper-admin/Cargo.toml → ...chived/v1.0.0/ecr-helper-admin/Cargo.toml
diff --git a/...tions/v1.0.0/ecr-helper-admin/src/main.rs → ...hived/v1.0.0/ecr-helper-admin/src/main.rs b/...tions/v1.0.0/ecr-helper-admin/src/main.rs → ...hived/v1.0.0/ecr-helper-admin/src/main.rs
diff --git a/...ions/v1.0.0/ecr-helper-control/Cargo.toml → ...ived/v1.0.0/ecr-helper-control/Cargo.toml b/...ions/v1.0.0/ecr-helper-control/Cargo.toml → ...ived/v1.0.0/ecr-helper-control/Cargo.toml
diff --git a/...ons/v1.0.0/ecr-helper-control/src/main.rs → ...ved/v1.0.0/ecr-helper-control/src/main.rs b/...ons/v1.0.0/ecr-helper-control/src/main.rs → ...ved/v1.0.0/ecr-helper-control/src/main.rs
diff --git a/...-enable-spot-instance-draining/Cargo.toml → ...-enable-spot-instance-draining/Cargo.toml b/...-enable-spot-instance-draining/Cargo.toml → ...-enable-spot-instance-draining/Cargo.toml
diff --git a/...enable-spot-instance-draining/src/main.rs → ...enable-spot-instance-draining/src/main.rs b/...enable-spot-instance-draining/src/main.rs → ...enable-spot-instance-draining/src/main.rs
diff --git a/...n/migrations/v1.0.3/add-sysctl/Cargo.toml → ...ons/archived/v1.0.3/add-sysctl/Cargo.toml b/...n/migrations/v1.0.3/add-sysctl/Cargo.toml → ...ons/archived/v1.0.3/add-sysctl/Cargo.toml
diff --git a/.../migrations/v1.0.3/add-sysctl/src/main.rs → ...ns/archived/v1.0.3/add-sysctl/src/main.rs b/.../migrations/v1.0.3/add-sysctl/src/main.rs → ...ns/archived/v1.0.3/add-sysctl/src/main.rs
diff --git a/...migrations/v1.0.5/add-lockdown/Cargo.toml → ...s/archived/v1.0.5/add-lockdown/Cargo.toml b/...migrations/v1.0.5/add-lockdown/Cargo.toml → ...s/archived/v1.0.5/add-lockdown/Cargo.toml
diff --git a/...igrations/v1.0.5/add-lockdown/src/main.rs → .../archived/v1.0.5/add-lockdown/src/main.rs b/...igrations/v1.0.5/add-lockdown/src/main.rs → .../archived/v1.0.5/add-lockdown/src/main.rs
diff --git a/...ns/v1.0.5/add-network-settings/Cargo.toml → ...ed/v1.0.5/add-network-settings/Cargo.toml b/...ns/v1.0.5/add-network-settings/Cargo.toml → ...ed/v1.0.5/add-network-settings/Cargo.toml
diff --git a/...s/v1.0.5/add-network-settings/src/main.rs → ...d/v1.0.5/add-network-settings/src/main.rs b/...s/v1.0.5/add-network-settings/src/main.rs → ...d/v1.0.5/add-network-settings/src/main.rs
diff --git a/...tions/v1.0.5/add-proxy-restart/Cargo.toml → ...hived/v1.0.5/add-proxy-restart/Cargo.toml b/...tions/v1.0.5/add-proxy-restart/Cargo.toml → ...hived/v1.0.5/add-proxy-restart/Cargo.toml
diff --git a/...ions/v1.0.5/add-proxy-restart/src/main.rs → ...ived/v1.0.5/add-proxy-restart/src/main.rs b/...ions/v1.0.5/add-proxy-restart/src/main.rs → ...ived/v1.0.5/add-proxy-restart/src/main.rs
diff --git a/...ions/v1.0.5/add-proxy-services/Cargo.toml → ...ived/v1.0.5/add-proxy-services/Cargo.toml b/...ions/v1.0.5/add-proxy-services/Cargo.toml → ...ived/v1.0.5/add-proxy-services/Cargo.toml
diff --git a/...ons/v1.0.5/add-proxy-services/src/main.rs → ...ved/v1.0.5/add-proxy-services/src/main.rs b/...ons/v1.0.5/add-proxy-services/src/main.rs → ...ved/v1.0.5/add-proxy-services/src/main.rs
diff --git a/...igrations/v1.0.5/add-user-data/Cargo.toml → .../archived/v1.0.5/add-user-data/Cargo.toml b/...igrations/v1.0.5/add-user-data/Cargo.toml → .../archived/v1.0.5/add-user-data/Cargo.toml
diff --git a/...grations/v1.0.5/add-user-data/src/main.rs → ...archived/v1.0.5/add-user-data/src/main.rs b/...grations/v1.0.5/add-user-data/src/main.rs → ...archived/v1.0.5/add-user-data/src/main.rs
diff --git a/...tions/v1.0.5/sysctl-subcommand/Cargo.toml → ...hived/v1.0.5/sysctl-subcommand/Cargo.toml b/...tions/v1.0.5/sysctl-subcommand/Cargo.toml → ...hived/v1.0.5/sysctl-subcommand/Cargo.toml
diff --git a/...ions/v1.0.5/sysctl-subcommand/src/main.rs → ...ived/v1.0.5/sysctl-subcommand/src/main.rs b/...ions/v1.0.5/sysctl-subcommand/src/main.rs → ...ived/v1.0.5/sysctl-subcommand/src/main.rs
diff --git a/...migrations/v1.0.6/add-shibaken/Cargo.toml → ...s/archived/v1.0.6/add-shibaken/Cargo.toml b/...migrations/v1.0.6/add-shibaken/Cargo.toml → ...s/archived/v1.0.6/add-shibaken/Cargo.toml
diff --git a/...igrations/v1.0.6/add-shibaken/src/main.rs → .../archived/v1.0.6/add-shibaken/src/main.rs b/...igrations/v1.0.6/add-shibaken/src/main.rs → .../archived/v1.0.6/add-shibaken/src/main.rs
diff --git a/...rations/v1.0.6/add-static-pods/Cargo.toml → ...rchived/v1.0.6/add-static-pods/Cargo.toml b/...rations/v1.0.6/add-static-pods/Cargo.toml → ...rchived/v1.0.6/add-static-pods/Cargo.toml
diff --git a/...ations/v1.0.6/add-static-pods/src/main.rs → ...chived/v1.0.6/add-static-pods/src/main.rs b/...ations/v1.0.6/add-static-pods/src/main.rs → ...chived/v1.0.6/add-static-pods/src/main.rs
diff --git a/.../v1.0.6/admin-container-v0-6-0/Cargo.toml → .../v1.0.6/admin-container-v0-6-0/Cargo.toml b/.../v1.0.6/admin-container-v0-6-0/Cargo.toml → .../v1.0.6/admin-container-v0-6-0/Cargo.toml
diff --git a/...v1.0.6/admin-container-v0-6-0/src/main.rs → ...v1.0.6/admin-container-v0-6-0/src/main.rs b/...v1.0.6/admin-container-v0-6-0/src/main.rs → ...v1.0.6/admin-container-v0-6-0/src/main.rs
diff --git a/...1.0.6/control-container-v0-4-2/Cargo.toml → ...1.0.6/control-container-v0-4-2/Cargo.toml b/...1.0.6/control-container-v0-4-2/Cargo.toml → ...1.0.6/control-container-v0-4-2/Cargo.toml
diff --git a/....0.6/control-container-v0-4-2/src/main.rs → ....0.6/control-container-v0-4-2/src/main.rs b/....0.6/control-container-v0-4-2/src/main.rs → ....0.6/control-container-v0-4-2/src/main.rs
diff --git a/...ubelet-standalone-tls-services/Cargo.toml → ...ubelet-standalone-tls-services/Cargo.toml b/...ubelet-standalone-tls-services/Cargo.toml → ...ubelet-standalone-tls-services/Cargo.toml
diff --git a/...belet-standalone-tls-services/src/main.rs → ...belet-standalone-tls-services/src/main.rs b/...belet-standalone-tls-services/src/main.rs → ...belet-standalone-tls-services/src/main.rs
diff --git a/...ubelet-standalone-tls-settings/Cargo.toml → ...ubelet-standalone-tls-settings/Cargo.toml b/...ubelet-standalone-tls-settings/Cargo.toml → ...ubelet-standalone-tls-settings/Cargo.toml
diff --git a/...belet-standalone-tls-settings/src/main.rs → ...belet-standalone-tls-settings/src/main.rs b/...belet-standalone-tls-settings/src/main.rs → ...belet-standalone-tls-settings/src/main.rs
diff --git a/...grations/v1.0.6/metricdog-init/Cargo.toml → ...archived/v1.0.6/metricdog-init/Cargo.toml b/...grations/v1.0.6/metricdog-init/Cargo.toml → ...archived/v1.0.6/metricdog-init/Cargo.toml
diff --git a/...rations/v1.0.6/metricdog-init/src/main.rs → ...rchived/v1.0.6/metricdog-init/src/main.rs b/...rations/v1.0.6/metricdog-init/src/main.rs → ...rchived/v1.0.6/metricdog-init/src/main.rs
diff --git a/...1.0.8/add-bootstrap-containers/Cargo.toml → ...1.0.8/add-bootstrap-containers/Cargo.toml b/...1.0.8/add-bootstrap-containers/Cargo.toml → ...1.0.8/add-bootstrap-containers/Cargo.toml
diff --git a/....0.8/add-bootstrap-containers/src/main.rs → ....0.8/add-bootstrap-containers/src/main.rs b/....0.8/add-bootstrap-containers/src/main.rs → ....0.8/add-bootstrap-containers/src/main.rs
diff --git a/.../v1.0.8/admin-container-v0-7-0/Cargo.toml → .../v1.0.8/admin-container-v0-7-0/Cargo.toml b/.../v1.0.8/admin-container-v0-7-0/Cargo.toml → .../v1.0.8/admin-container-v0-7-0/Cargo.toml
diff --git a/...v1.0.8/admin-container-v0-7-0/src/main.rs → ...v1.0.8/admin-container-v0-7-0/src/main.rs b/...v1.0.8/admin-container-v0-7-0/src/main.rs → ...v1.0.8/admin-container-v0-7-0/src/main.rs
diff --git a/...1.0.8/control-container-v0-5-0/Cargo.toml → ...1.0.8/control-container-v0-5-0/Cargo.toml b/...1.0.8/control-container-v0-5-0/Cargo.toml → ...1.0.8/control-container-v0-5-0/Cargo.toml
diff --git a/....0.8/control-container-v0-5-0/src/main.rs → ....0.8/control-container-v0-5-0/src/main.rs b/....0.8/control-container-v0-5-0/src/main.rs → ....0.8/control-container-v0-5-0/src/main.rs
diff --git a/...s/v1.0.8/kubelet-eviction-hard/Cargo.toml → ...d/v1.0.8/kubelet-eviction-hard/Cargo.toml b/...s/v1.0.8/kubelet-eviction-hard/Cargo.toml → ...d/v1.0.8/kubelet-eviction-hard/Cargo.toml
diff --git a/.../v1.0.8/kubelet-eviction-hard/src/main.rs → .../v1.0.8/kubelet-eviction-hard/src/main.rs b/.../v1.0.8/kubelet-eviction-hard/src/main.rs → .../v1.0.8/kubelet-eviction-hard/src/main.rs
diff --git a/...et-unsafe-sysctl-kube-reserved/Cargo.toml → ...et-unsafe-sysctl-kube-reserved/Cargo.toml b/...et-unsafe-sysctl-kube-reserved/Cargo.toml → ...et-unsafe-sysctl-kube-reserved/Cargo.toml
diff --git a/...t-unsafe-sysctl-kube-reserved/src/main.rs → ...t-unsafe-sysctl-kube-reserved/src/main.rs b/...t-unsafe-sysctl-kube-reserved/src/main.rs → ...t-unsafe-sysctl-kube-reserved/src/main.rs
diff --git a/...8/proxy-affect-host-containers/Cargo.toml → ...8/proxy-affect-host-containers/Cargo.toml b/...8/proxy-affect-host-containers/Cargo.toml → ...8/proxy-affect-host-containers/Cargo.toml
diff --git a/.../proxy-affect-host-containers/src/main.rs → .../proxy-affect-host-containers/src/main.rs b/.../proxy-affect-host-containers/src/main.rs → .../proxy-affect-host-containers/src/main.rs