diff --git a/.drone.yml b/.drone.yml index 5e57ca5e..a624078c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -114,8 +114,8 @@ steps: from_secret: docker_password platforms: - linux/amd64 - target: "rancher/os:${DRONE_TAG}" - template: "rancher/os:${DRONE_TAG}-ARCH" + target: "rancher/os2:${DRONE_TAG}" + template: "rancher/os2:${DRONE_TAG}-ARCH" when: instance: - drone-publish.rancher.io diff --git a/Dockerfile b/Dockerfile index 24c68d78..a39c6b67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ COPY --from=build /usr/bin/busybox-static /usr/bin/busybox COPY --from=build /usr/bin/rancherd /usr/bin/rancherd COPY --from=build /usr/bin/luet /usr/bin/luet COPY --from=build /usr/bin/helm /usr/bin/helm -COPY --from=build /usr/src/dist/rancheros-operator-chart.tgz /usr/share/rancher/os/ +COPY --from=build /usr/src/dist/rancheros-operator-chart.tgz /usr/share/rancher/os2/ COPY framework/files/etc/luet/luet.yaml /etc/luet/luet.yaml COPY --from=build /etc/ssl/certs /etc/ssl/certs diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 39d9b166..a8c3e276 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -13,7 +13,7 @@ RUN if [ "${ARCH}" == "amd64" ]; then \ ENV DOCKER_BUILDKIT 1 ENV DOCKER_CLI_EXPERIMENTAL enabled ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS DOCKER_USERNAME DOCKER_PASSWORD AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_DEFAULT_REGION -ENV DAPPER_SOURCE /go/src/github.com/rancher/os/ +ENV DAPPER_SOURCE /go/src/github.com/rancher/os2/ ENV DAPPER_OUTPUT ./bin ./dist ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_RUN_ARGS "-v ros-go16-pkg-1:/go/pkg -v ros-go16-cache-1:/root/.cache/go-build" diff --git a/Makefile b/Makefile index 4bb64a53..f74aeeaa 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .DEFAULT_GOAL := package -REPO?=rancher/os +REPO?=rancher/os2 TAG?=dev IMAGE=${REPO}:${TAG} diff --git a/chart/values.yaml b/chart/values.yaml index 28a4e607..557f705d 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,5 +1,5 @@ image: - repository: rancher/os + repository: rancher/os2 tag: dev imagePullPolicy: IfNotPresent diff --git a/cmd/ros-installer/main.go b/cmd/ros-installer/main.go index ad5128fb..7da5f268 100644 --- a/cmd/ros-installer/main.go +++ b/cmd/ros-installer/main.go @@ -4,8 +4,8 @@ import ( "flag" "os" - "github.com/rancher/os/pkg/config" - "github.com/rancher/os/pkg/install" + "github.com/rancher/os2/pkg/config" + "github.com/rancher/os2/pkg/install" "github.com/sirupsen/logrus" "sigs.k8s.io/yaml" ) diff --git a/cmd/ros-operator/main.go b/cmd/ros-operator/main.go index 0978d864..e9a4194c 100644 --- a/cmd/ros-operator/main.go +++ b/cmd/ros-operator/main.go @@ -5,7 +5,7 @@ import ( "flag" "os" - "github.com/rancher/os/pkg/operator" + "github.com/rancher/os2/pkg/operator" "github.com/rancher/wrangler/pkg/signals" "github.com/sirupsen/logrus" ) diff --git a/framework/files/usr/lib/systemd/system/ros-installer.service b/framework/files/usr/lib/systemd/system/ros-installer.service index 89f781d3..c1523803 100644 --- a/framework/files/usr/lib/systemd/system/ros-installer.service +++ b/framework/files/usr/lib/systemd/system/ros-installer.service @@ -1,6 +1,6 @@ [Unit] Description=RancherOS Automatic Installation -Documentation=https://github.com/rancher/os +Documentation=https://github.com/rancher/os2 Wants=network-online.target After=network-online.target Before=getty-pre.target serial-getty@ttyS0.service diff --git a/framework/files/usr/lib/systemd/system/ros-populate-node-labels.service b/framework/files/usr/lib/systemd/system/ros-populate-node-labels.service index f3fb5835..26210fad 100644 --- a/framework/files/usr/lib/systemd/system/ros-populate-node-labels.service +++ b/framework/files/usr/lib/systemd/system/ros-populate-node-labels.service @@ -1,6 +1,6 @@ [Unit] Description=RancherOS Populated Node Labels -Documentation=https://github.com/rancher/os +Documentation=https://github.com/rancher/os2 Before=network-online.target [Install] diff --git a/framework/files/usr/sbin/ros-operator-install b/framework/files/usr/sbin/ros-operator-install index e1eb1832..51c2b58a 100755 --- a/framework/files/usr/sbin/ros-operator-install +++ b/framework/files/usr/sbin/ros-operator-install @@ -29,7 +29,7 @@ helm upgrade \ --set image.repository=${IMAGE_REPO} \ --set image.tag=${IMAGE_TAG} \ --set image.imagePullPolicy=${PULL_POLICY} \ - rancheros-operator /usr/share/rancher/os/rancheros-operator-chart.tgz + rancheros-operator /usr/share/rancher/os2/rancheros-operator-chart.tgz while ! manifest | kubectl apply -f -; do sleep 15 diff --git a/go.mod b/go.mod index 779d0d20..873bfb20 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/rancher/os +module github.com/rancher/os2 go 1.16 diff --git a/pkg/apis/rancheros.cattle.io/v1/zz_generated_register.go b/pkg/apis/rancheros.cattle.io/v1/zz_generated_register.go index 4573bf80..c8c6e07f 100644 --- a/pkg/apis/rancheros.cattle.io/v1/zz_generated_register.go +++ b/pkg/apis/rancheros.cattle.io/v1/zz_generated_register.go @@ -21,7 +21,7 @@ limitations under the License. package v1 import ( - rancheros "github.com/rancher/os/pkg/apis/rancheros.cattle.io" + rancheros "github.com/rancher/os2/pkg/apis/rancheros.cattle.io" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/clients/clients.go b/pkg/clients/clients.go index f98f623f..ec23f57b 100644 --- a/pkg/clients/clients.go +++ b/pkg/clients/clients.go @@ -3,14 +3,14 @@ package clients import ( "context" - "github.com/rancher/os/pkg/generated/controllers/fleet.cattle.io" - fleetcontrollers "github.com/rancher/os/pkg/generated/controllers/fleet.cattle.io/v1alpha1" - "github.com/rancher/os/pkg/generated/controllers/management.cattle.io" - ranchercontrollers "github.com/rancher/os/pkg/generated/controllers/management.cattle.io/v3" - "github.com/rancher/os/pkg/generated/controllers/provisioning.cattle.io" - provcontrollers "github.com/rancher/os/pkg/generated/controllers/provisioning.cattle.io/v1" - "github.com/rancher/os/pkg/generated/controllers/rancheros.cattle.io" - oscontrollers "github.com/rancher/os/pkg/generated/controllers/rancheros.cattle.io/v1" + "github.com/rancher/os2/pkg/generated/controllers/fleet.cattle.io" + fleetcontrollers "github.com/rancher/os2/pkg/generated/controllers/fleet.cattle.io/v1alpha1" + "github.com/rancher/os2/pkg/generated/controllers/management.cattle.io" + ranchercontrollers "github.com/rancher/os2/pkg/generated/controllers/management.cattle.io/v3" + "github.com/rancher/os2/pkg/generated/controllers/provisioning.cattle.io" + provcontrollers "github.com/rancher/os2/pkg/generated/controllers/provisioning.cattle.io/v1" + "github.com/rancher/os2/pkg/generated/controllers/rancheros.cattle.io" + oscontrollers "github.com/rancher/os2/pkg/generated/controllers/rancheros.cattle.io/v1" "github.com/rancher/wrangler/pkg/clients" "github.com/rancher/wrangler/pkg/generic" "k8s.io/client-go/rest" diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go index f8f7fa09..78686020 100644 --- a/pkg/codegen/main.go +++ b/pkg/codegen/main.go @@ -13,7 +13,7 @@ import ( func main() { os.Unsetenv("GOPATH") controllergen.Run(args.Options{ - OutputPackage: "github.com/rancher/os/pkg/generated", + OutputPackage: "github.com/rancher/os2/pkg/generated", Boilerplate: "scripts/boilerplate.go.txt", Groups: map[string]args.Group{ "provisioning.cattle.io": { diff --git a/pkg/controllers/inventory/inventory.go b/pkg/controllers/inventory/inventory.go index a891a500..69971a31 100644 --- a/pkg/controllers/inventory/inventory.go +++ b/pkg/controllers/inventory/inventory.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - v1 "github.com/rancher/os/pkg/apis/rancheros.cattle.io/v1" - "github.com/rancher/os/pkg/clients" - ranchercontrollers "github.com/rancher/os/pkg/generated/controllers/management.cattle.io/v3" - provcontrollers "github.com/rancher/os/pkg/generated/controllers/provisioning.cattle.io/v1" - v12 "github.com/rancher/os/pkg/generated/controllers/rancheros.cattle.io/v1" + v1 "github.com/rancher/os2/pkg/apis/rancheros.cattle.io/v1" + "github.com/rancher/os2/pkg/clients" + ranchercontrollers "github.com/rancher/os2/pkg/generated/controllers/management.cattle.io/v3" + provcontrollers "github.com/rancher/os2/pkg/generated/controllers/provisioning.cattle.io/v1" + v12 "github.com/rancher/os2/pkg/generated/controllers/rancheros.cattle.io/v1" v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3" "github.com/rancher/wrangler/pkg/name" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controllers/managedos/managedos.go b/pkg/controllers/managedos/managedos.go index 1dd38faf..2ba9db19 100644 --- a/pkg/controllers/managedos/managedos.go +++ b/pkg/controllers/managedos/managedos.go @@ -4,11 +4,11 @@ import ( "context" "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1" - provv1 "github.com/rancher/os/pkg/apis/rancheros.cattle.io/v1" - "github.com/rancher/os/pkg/clients" - fleetcontrollers "github.com/rancher/os/pkg/generated/controllers/fleet.cattle.io/v1alpha1" - ranchercontrollers "github.com/rancher/os/pkg/generated/controllers/management.cattle.io/v3" - oscontrollers "github.com/rancher/os/pkg/generated/controllers/rancheros.cattle.io/v1" + provv1 "github.com/rancher/os2/pkg/apis/rancheros.cattle.io/v1" + "github.com/rancher/os2/pkg/clients" + fleetcontrollers "github.com/rancher/os2/pkg/generated/controllers/fleet.cattle.io/v1alpha1" + ranchercontrollers "github.com/rancher/os2/pkg/generated/controllers/management.cattle.io/v3" + oscontrollers "github.com/rancher/os2/pkg/generated/controllers/rancheros.cattle.io/v1" "github.com/rancher/wrangler/pkg/name" "github.com/rancher/wrangler/pkg/relatedresource" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controllers/managedos/template.go b/pkg/controllers/managedos/template.go index c8a99c2d..2fb30055 100644 --- a/pkg/controllers/managedos/template.go +++ b/pkg/controllers/managedos/template.go @@ -3,8 +3,8 @@ package managedos import ( "strings" - osv1 "github.com/rancher/os/pkg/apis/rancheros.cattle.io/v1" - "github.com/rancher/os/pkg/clients" + osv1 "github.com/rancher/os2/pkg/apis/rancheros.cattle.io/v1" + "github.com/rancher/os2/pkg/clients" upgradev1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/pkg/generated/controllers/fleet.cattle.io/interface.go b/pkg/generated/controllers/fleet.cattle.io/interface.go index 2a6db659..03a7e14d 100644 --- a/pkg/generated/controllers/fleet.cattle.io/interface.go +++ b/pkg/generated/controllers/fleet.cattle.io/interface.go @@ -20,7 +20,7 @@ package fleet import ( "github.com/rancher/lasso/pkg/controller" - v1alpha1 "github.com/rancher/os/pkg/generated/controllers/fleet.cattle.io/v1alpha1" + v1alpha1 "github.com/rancher/os2/pkg/generated/controllers/fleet.cattle.io/v1alpha1" ) type Interface interface { diff --git a/pkg/generated/controllers/management.cattle.io/interface.go b/pkg/generated/controllers/management.cattle.io/interface.go index 927b21e8..cdd53202 100644 --- a/pkg/generated/controllers/management.cattle.io/interface.go +++ b/pkg/generated/controllers/management.cattle.io/interface.go @@ -20,7 +20,7 @@ package management import ( "github.com/rancher/lasso/pkg/controller" - v3 "github.com/rancher/os/pkg/generated/controllers/management.cattle.io/v3" + v3 "github.com/rancher/os2/pkg/generated/controllers/management.cattle.io/v3" ) type Interface interface { diff --git a/pkg/generated/controllers/provisioning.cattle.io/interface.go b/pkg/generated/controllers/provisioning.cattle.io/interface.go index 29fff13a..d26699f8 100644 --- a/pkg/generated/controllers/provisioning.cattle.io/interface.go +++ b/pkg/generated/controllers/provisioning.cattle.io/interface.go @@ -20,7 +20,7 @@ package provisioning import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/os/pkg/generated/controllers/provisioning.cattle.io/v1" + v1 "github.com/rancher/os2/pkg/generated/controllers/provisioning.cattle.io/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/rancheros.cattle.io/interface.go b/pkg/generated/controllers/rancheros.cattle.io/interface.go index a23f4afb..a8100495 100644 --- a/pkg/generated/controllers/rancheros.cattle.io/interface.go +++ b/pkg/generated/controllers/rancheros.cattle.io/interface.go @@ -20,7 +20,7 @@ package rancheros import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/os/pkg/generated/controllers/rancheros.cattle.io/v1" + v1 "github.com/rancher/os2/pkg/generated/controllers/rancheros.cattle.io/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/rancheros.cattle.io/v1/interface.go b/pkg/generated/controllers/rancheros.cattle.io/v1/interface.go index 67b4a108..afe72759 100644 --- a/pkg/generated/controllers/rancheros.cattle.io/v1/interface.go +++ b/pkg/generated/controllers/rancheros.cattle.io/v1/interface.go @@ -20,7 +20,7 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/os/pkg/apis/rancheros.cattle.io/v1" + v1 "github.com/rancher/os2/pkg/apis/rancheros.cattle.io/v1" "github.com/rancher/wrangler/pkg/schemes" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/rancheros.cattle.io/v1/machineinventory.go b/pkg/generated/controllers/rancheros.cattle.io/v1/machineinventory.go index 3a820400..5cd827ce 100644 --- a/pkg/generated/controllers/rancheros.cattle.io/v1/machineinventory.go +++ b/pkg/generated/controllers/rancheros.cattle.io/v1/machineinventory.go @@ -24,7 +24,7 @@ import ( "github.com/rancher/lasso/pkg/client" "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/os/pkg/apis/rancheros.cattle.io/v1" + v1 "github.com/rancher/os2/pkg/apis/rancheros.cattle.io/v1" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" diff --git a/pkg/generated/controllers/rancheros.cattle.io/v1/managedosimage.go b/pkg/generated/controllers/rancheros.cattle.io/v1/managedosimage.go index a7fd8235..b278d78b 100644 --- a/pkg/generated/controllers/rancheros.cattle.io/v1/managedosimage.go +++ b/pkg/generated/controllers/rancheros.cattle.io/v1/managedosimage.go @@ -24,7 +24,7 @@ import ( "github.com/rancher/lasso/pkg/client" "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/os/pkg/apis/rancheros.cattle.io/v1" + v1 "github.com/rancher/os2/pkg/apis/rancheros.cattle.io/v1" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" diff --git a/pkg/install/ask.go b/pkg/install/ask.go index 7554f1d0..66d4d303 100644 --- a/pkg/install/ask.go +++ b/pkg/install/ask.go @@ -4,9 +4,9 @@ import ( "os/exec" "strings" - "github.com/rancher/os/pkg/config" - "github.com/rancher/os/pkg/questions" - "github.com/rancher/os/pkg/util" + "github.com/rancher/os2/pkg/config" + "github.com/rancher/os2/pkg/questions" + "github.com/rancher/os2/pkg/util" ) func Ask(cfg *config.Config) error { diff --git a/pkg/install/install.go b/pkg/install/install.go index 0c37dfa3..7c42263d 100644 --- a/pkg/install/install.go +++ b/pkg/install/install.go @@ -6,8 +6,8 @@ import ( "os" "os/exec" - "github.com/rancher/os/pkg/config" - "github.com/rancher/os/pkg/questions" + "github.com/rancher/os2/pkg/config" + "github.com/rancher/os2/pkg/questions" "sigs.k8s.io/yaml" ) diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 8db310f7..1d36ab7d 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -3,11 +3,11 @@ package operator import ( "context" - v1 "github.com/rancher/os/pkg/apis/rancheros.cattle.io/v1" - "github.com/rancher/os/pkg/clients" - "github.com/rancher/os/pkg/controllers/inventory" - "github.com/rancher/os/pkg/controllers/managedos" - "github.com/rancher/os/pkg/server" + v1 "github.com/rancher/os2/pkg/apis/rancheros.cattle.io/v1" + "github.com/rancher/os2/pkg/clients" + "github.com/rancher/os2/pkg/controllers/inventory" + "github.com/rancher/os2/pkg/controllers/managedos" + "github.com/rancher/os2/pkg/server" "github.com/rancher/steve/pkg/aggregation" "github.com/rancher/wrangler/pkg/crd" "github.com/sirupsen/logrus" diff --git a/pkg/server/server.go b/pkg/server/server.go index 3e78ae8f..27a75c64 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - v1 "github.com/rancher/os/pkg/apis/rancheros.cattle.io/v1" - "github.com/rancher/os/pkg/clients" - ranchercontrollers "github.com/rancher/os/pkg/generated/controllers/management.cattle.io/v3" - roscontrollers "github.com/rancher/os/pkg/generated/controllers/rancheros.cattle.io/v1" + v1 "github.com/rancher/os2/pkg/apis/rancheros.cattle.io/v1" + "github.com/rancher/os2/pkg/clients" + ranchercontrollers "github.com/rancher/os2/pkg/generated/controllers/management.cattle.io/v3" + roscontrollers "github.com/rancher/os2/pkg/generated/controllers/rancheros.cattle.io/v1" v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3" corecontrollers "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/sirupsen/logrus" diff --git a/ros-image-build b/ros-image-build index c2c49298..cc174cc0 100755 --- a/ros-image-build +++ b/ros-image-build @@ -9,7 +9,7 @@ build() dockerfile() { cat << "EOF" -ARG IMAGE=rancher/os:dev +ARG IMAGE=rancher/os2:dev FROM ${IMAGE} AS os @@ -148,7 +148,7 @@ FROM tools AS ami ARG AWS_ACCESS_KEY_ID ARG AWS_SECRET_ACCESS_KEY ARG AWS_DEFAULT_REGION -ARG IMAGE=rancher/os:dev +ARG IMAGE=rancher/os2:dev ARG NAME=RancherOS-Image-dev ARG VERSION=1 ARG GIT_COMMIT=HEAD diff --git a/scripts/package b/scripts/package index 14462894..45587835 100755 --- a/scripts/package +++ b/scripts/package @@ -33,7 +33,7 @@ isoinfo -x /boot/kernel.xz -R -i build/output.iso > build/output-kernel isoinfo -x /boot/rootfs.xz -R -i build/output.iso > build/output-initrd -RELEASE_URL=${RELEASE_URL:-https://github.com/rancher/os/releases/download} +RELEASE_URL=${RELEASE_URL:-https://github.com/rancher/os2/releases/download} INSTALL_CFG=${RELEASE_URL}/${VERSION}/example-cloud-init PXE_ASSET_VERSION="\${version}-\${arch}" if [ "${TAG}" = "dev" ]; then