diff --git a/.conform.yaml b/.conform.yaml index afd1441bc..f33d89592 100644 --- a/.conform.yaml +++ b/.conform.yaml @@ -1,5 +1,3 @@ -metadata: - repository: autonomy/talos policies: - type: conventionalCommit spec: @@ -25,15 +23,3 @@ policies: - rootfs - tools - '*' -script: - template: | - #!/bin/sh - - set -e - - mkdir -p ./build - cd ./src/rootfs && conform build - cd ../initramfs && conform build - cd ../image && conform build - cd ../docs && conform build - cd ../ diff --git a/.dockerignore b/.dockerignore index 411a5b8a4..ca8923d31 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,8 @@ -build -vendor +** +!hack +!installer +!internal +!vendor +!web +!go.mod +!go.sum diff --git a/.gitignore b/.gitignore index 4bc55778e..7d39e636b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build +cache vendor .vscode diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..914d3edb1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,232 @@ +# syntax=docker/dockerfile:experimental +ARG TOOLCHAIN_VERSION +ARG KERNEL_VERSION +ARG GOLANG_VERSION + +ARG GOLANG_VERSION +FROM golang:${GOLANG_VERSION} AS proto +RUN apt update +RUN apt -y install bsdtar +WORKDIR /go/src/github.com/golang/protobuf +RUN curl -L https://github.com/golang/protobuf/archive/v1.2.0.tar.gz | tar -xz --strip-components=1 +RUN cd protoc-gen-go && go install . +RUN curl -L https://github.com/google/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip | bsdtar -xf - -C /tmp \ + && mv /tmp/bin/protoc /bin \ + && mv /tmp/include/* /usr/local/include \ + && chmod +x /bin/protoc +WORKDIR /osd +COPY ./internal/app/osd/proto ./proto +RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto +WORKDIR /trustd +COPY ./internal/app/trustd/proto ./proto +RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto +WORKDIR /blockd +COPY ./internal/app/blockd/proto ./proto +RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto + +ARG GOLANG_VERSION +FROM golang:${GOLANG_VERSION} AS base +ENV GO111MODULE on +WORKDIR /src +COPY ./ ./ +ENV GOOS linux +ENV GOARCH amd64 +ENV CGO_ENABLED 0 +COPY --from=proto /osd/proto/api.pb.go ./internal/app/osd/proto +COPY --from=proto /trustd/proto/api.pb.go ./internal/app/trustd/proto +COPY --from=proto /blockd/proto/api.pb.go ./internal/app/blockd/proto +RUN go mod download +RUN go mod verify + +FROM base AS udevd-build +ARG SHA +ARG TAG +ARG VERSION_PKG="github.com/autonomy/talos/internal/pkg/version" +WORKDIR /src/internal/app/udevd +RUN go build -a -ldflags "-s -w -X ${VERSION_PKG}.Name=Server -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /udevd +RUN chmod +x /udevd +ARG APP +FROM scratch AS udevd +COPY --from=udevd-build /udevd /udevd +ENTRYPOINT ["/udevd"] + +ARG TOOLCHAIN_VERSION +FROM autonomy/toolchain:${TOOLCHAIN_VERSION} AS rootfs +RUN rm -rf /rootfs/etc +RUN mkdir -p /rootfs/var/etc +RUN ln -sv var/etc /rootfs/etc +# xfsprogs +RUN mkdir -p /etc/ssl/certs +RUN ln -s /toolchain/etc/ssl/certs/ca-certificates /etc/ssl/certs/ca-certificates +WORKDIR /tmp/xfsprogs +RUN curl -L https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.18.0.tar.xz | tar -xJ --strip-components=1 +RUN make \ + DEBUG=-DNDEBUG \ + INSTALL_USER=0 \ + INSTALL_GROUP=0 \ + LOCAL_CONFIGURE_OPTIONS="--prefix=/" +RUN make install DESTDIR=/rootfs +# libseccomp +WORKDIR /toolchain/usr/local/src/libseccomp +RUN curl -L https://github.com/seccomp/libseccomp/releases/download/v2.3.3/libseccomp-2.3.3.tar.gz | tar --strip-components=1 -xz +WORKDIR /toolchain/usr/local/src/libseccomp/build +RUN ../configure \ + --prefix=/usr \ + --disable-static +RUN make -j $(($(nproc) / 2)) +RUN make install DESTDIR=/rootfs +# libblkid +RUN cp /toolchain/lib/libblkid.* /rootfs/lib +# libuuid +RUN cp /toolchain/lib/libuuid.* /rootfs/lib +# ca-certificates +RUN mkdir -p /rootfs/etc/ssl/certs +RUN curl -o /rootfs/etc/ssl/certs/ca-certificates.crt https://curl.haxx.se/ca/cacert.pem +# containerd +RUN curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.13.0/crictl-v1.13.0-linux-amd64.tar.gz | tar -xz -C /rootfs/bin +RUN curl -L https://github.com/containerd/containerd/releases/download/v1.2.1/containerd-1.2.1.linux-amd64.tar.gz | tar --strip-components=1 -xz -C /rootfs/bin +RUN rm /rootfs/bin/ctr +# runc +RUN curl -L https://github.com/opencontainers/runc/releases/download/v1.0.0-rc6/runc.amd64 -o /rootfs/bin/runc +RUN chmod +x /rootfs/bin/runc +RUN ln -sv ../opt /rootfs/var/opt +RUN mkdir -p /rootfs/opt/cni/bin +# CNI +RUN curl -L https://github.com/containernetworking/cni/releases/download/v0.6.0/cni-amd64-v0.6.0.tgz | tar -xz -C /rootfs/opt/cni/bin +RUN curl -L https://github.com/containernetworking/plugins/releases/download/v0.7.4/cni-plugins-amd64-v0.7.4.tgz | tar -xz -C /rootfs/opt/cni/bin +# kubeadm +RUN curl --retry 3 --retry-delay 60 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.1/bin/linux/amd64/kubeadm -o /rootfs/bin/kubeadm +RUN chmod +x /rootfs/bin/kubeadm +# udevd +COPY --from=udevd-build /udevd /rootfs/bin/udevd +# cleanup +COPY ./hack/scripts/cleanup.sh /bin +RUN chmod +x /bin/cleanup.sh +RUN /bin/cleanup.sh /rootfs +COPY ./hack/scripts/symlink.sh /bin +RUN chmod +x /bin/symlink.sh +RUN /bin/symlink.sh /rootfs +WORKDIR /rootfs +RUN ["/toolchain/bin/tar", "-cvpzf", "/rootfs.tar.gz", "."] + +FROM base AS initramfs +ARG SHA +ARG TAG +ARG VERSION_PKG="github.com/autonomy/talos/internal/pkg/version" +ENV CGO_ENABLED 1 +RUN apt update \ + && apt install -y util-linux libblkid-dev cpio xz-utils +WORKDIR /src/internal/app/init +RUN go build -a -ldflags "-s -w -X ${VERSION_PKG}.Name=Server -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /init +RUN chmod +x /init +WORKDIR /initramfs +RUN cp /init ./ +COPY --from=rootfs /rootfs ./ +COPY ./hack/scripts/cleanup.sh /bin +RUN chmod +x /bin/cleanup.sh +RUN /bin/cleanup.sh /initramfs +RUN find . 2>/dev/null | cpio -H newc -o | xz -v -C crc32 -0 -e -T 0 -z >/initramfs.xz + +FROM base AS osd-build +ARG SHA +ARG TAG +ARG VERSION_PKG="github.com/autonomy/talos/internal/pkg/version" +WORKDIR /src/internal/app/osd +RUN go build -a -ldflags "-s -w -X ${VERSION_PKG}.Name=Server -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /osd +RUN chmod +x /osd + +ARG APP +FROM scratch AS osd +COPY --from=osd-build /osd /osd +ENTRYPOINT ["/osd"] + +FROM base AS osctl +ARG SHA +ARG TAG +ARG VERSION_PKG="github.com/autonomy/talos/internal/pkg/version" +WORKDIR /src/internal/app/osctl +RUN go build -a -ldflags "-s -w -X ${VERSION_PKG}.Name=Client -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /osctl-linux-amd64 +RUN GOOS=darwin GOARCH=amd64 go build -a -ldflags "-s -w -X ${VERSION_PKG}.Name=Client -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /osctl-darwin-amd64 +RUN chmod +x /osctl-linux-amd64 +RUN chmod +x /osctl-darwin-amd64 + +FROM base AS trustd-build +ARG SHA +ARG TAG +ARG VERSION_PKG="github.com/autonomy/talos/internal/pkg/version" +WORKDIR /src/internal/app/trustd +RUN go build -a -ldflags "-s -w -X ${VERSION_PKG}.Name=Server -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /trustd +RUN chmod +x /trustd +ARG APP +FROM scratch AS trustd +COPY --from=trustd-build /trustd /trustd +ENTRYPOINT ["/trustd"] + +FROM base AS proxyd-build +ARG SHA +ARG TAG +ARG VERSION_PKG="github.com/autonomy/talos/internal/pkg/version" +WORKDIR /src/internal/app/proxyd +RUN go build -a -ldflags "-s -w -X ${VERSION_PKG}.Name=Server -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /proxyd +RUN chmod +x /proxyd +ARG APP +FROM scratch AS proxyd +COPY --from=proxyd-build /proxyd /proxyd +ENTRYPOINT ["/proxyd"] + +FROM base AS blockd-build +ARG SHA +ARG TAG +ARG VERSION_PKG="github.com/autonomy/talos/internal/pkg/version" +WORKDIR /src/internal/app/blockd +RUN go build -a -ldflags "-s -w -X ${VERSION_PKG}.Name=Server -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /blockd +RUN chmod +x /blockd +ARG APP +FROM scratch AS blockd +COPY --from=blockd-build /blockd /blockd +ENTRYPOINT ["/blockd"] + +FROM base AS test +RUN apt update \ + && apt install -y util-linux libblkid-dev xfsprogs +RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.12.3 +RUN chmod +x ./hack/golang/test.sh +ENV PATH /rootfs/bin:$PATH +RUN ./hack/golang/test.sh --unit +RUN ./hack/golang/test.sh --lint ./hack/golang/golangci-lint.yaml + +FROM golang:1.11.4 as docs +RUN curl -L https://github.com/gohugoio/hugo/releases/download/v0.49.2/hugo_0.49.2_Linux-64bit.tar.gz | tar -xz -C /bin +WORKDIR /web +COPY ./web ./ +RUN mkdir /docs +RUN hugo --destination=/docs --verbose +RUN echo "talos.autonomy.io" > /docs/CNAME + +ARG KERNEL_VERSION +FROM autonomy/kernel:${KERNEL_VERSION} as kernel + +FROM alpine:3.7 AS installer-build +RUN apk --update add curl tar xz +WORKDIR /usr/local/src/syslinux +RUN curl -L https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.03.tar.xz | tar --strip-components=1 -xJ +WORKDIR / +COPY --from=kernel /vmlinuz /generated/boot/vmlinuz +COPY --from=rootfs /rootfs.tar.gz /generated/rootfs.tar.gz +COPY --from=initramfs /initramfs.xz /generated/boot/initramfs.xz + +FROM alpine:3.7 AS installer +RUN apk --update add bash curl gzip e2fsprogs tar cdrkit parted syslinux util-linux xfsprogs xz sgdisk sfdisk qemu-img unzip +COPY --from=installer-build /usr/local/src/syslinux /usr/local/src/syslinux +COPY --from=installer-build /generated/rootfs.tar.gz /generated/rootfs.tar.gz +COPY --from=installer-build /generated/boot /generated/boot +RUN curl -L https://releases.hashicorp.com/packer/1.3.1/packer_1.3.1_linux_amd64.zip -o /tmp/packer.zip \ + && unzip -d /tmp /tmp/packer.zip \ + && mv /tmp/packer /bin \ + && rm /tmp/packer.zip +COPY ./hack/installer/packer.json /packer.json +COPY ./hack/installer/entrypoint.sh /bin/entrypoint.sh +RUN chmod +x /bin/entrypoint.sh +ARG TAG +ENV VERSION ${TAG} +ENTRYPOINT ["entrypoint.sh"] diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..6cd4e2446 --- /dev/null +++ b/Makefile @@ -0,0 +1,95 @@ +SHA := $(shell gitmeta git sha) +TAG := $(shell gitmeta image tag) +BUILT := $(shell gitmeta built) + +COMMON_APP_ARGS := -f ./Dockerfile --build-arg TOOLCHAIN_VERSION=690a03a --build-arg KERNEL_VERSION=e18620a --build-arg GOLANG_VERSION=1.11.4 --build-arg SHA=$(SHA) --build-arg TAG=$(TAG) . + +export DOCKER_BUILDKIT := 1 + +all: enforce rootfs initramfs osd osctl trustd proxyd blockd udevd test installer docs + +enforce: + @conform enforce + +osd: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + +osctl: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + @docker run --rm -it -v $(PWD)/build:/build autonomy/$@:$(SHA) cp /osctl-linux-amd64 /build + @docker run --rm -it -v $(PWD)/build:/build autonomy/$@:$(SHA) cp /osctl-darwin-amd64 /build + +trustd: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + +proxyd: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + +blockd: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + +udevd: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) \ + +test: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + +rootfs: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + @docker run --rm -it -v $(PWD)/build:/build autonomy/$@:$(SHA) cp /rootfs.tar.gz /build + +initramfs: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + @docker run --rm -it -v $(PWD)/build:/build autonomy/$@:$(SHA) cp /initramfs.xz /build + +.PHONY: docs +docs: + @docker build \ + -t autonomy/$@:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + @rm -rf ./docs + @docker run --rm -it -v $(PWD):/out autonomy/$@:$(SHA) cp -R /docs /out + +.PHONY: installer +installer: + @docker build \ + -t autonomy/talos:$(SHA) \ + --target=$@ \ + $(COMMON_APP_ARGS) + @docker run --rm -it -v $(PWD)/build:/build autonomy/talos:$(SHA) cp /generated/boot/vmlinuz /build + +deps: + @GO111MODULES=on CGO_ENABLED=0 go get -u github.com/autonomy/gitmeta + @GO111MODULES=on CGO_ENABLED=0 go get -u github.com/autonomy/conform + +clean: + go clean -modcache + rm -rf build vendor diff --git a/brigade.js b/brigade.js deleted file mode 100644 index db91c4470..000000000 --- a/brigade.js +++ /dev/null @@ -1,71 +0,0 @@ -const { events, Job, Group } = require("brigadier"); - -events.on("exec", function (e, project) { - job = conform(e, project) - job.run().then(result => { - console.log(result.toString()) - }) -}) - -events.on("push", function (e, project) { - job = conform(e, project) - job.run().then(result => { - console.log(result.toString()) - }) -}) - -events.on("pull_request", function (e, project) { - start = notify("pending", `Build ${e.buildID} started`, e, project) - job = conform(e, project) - Group.runAll([start, job]) - .then(() => { - return notify("success", `Build ${e.buildID} passed`, e, project).run() - }).catch(err => { - return notify("failure", `Build ${e.buildID} failed`, e, project).run() - }); -}) - -function conform(e, project) { - var job = new Job("talos", "autonomy/conform:latest") - - job.env = { - // "DOCKER_HOST": "tcp://docker:2375" - "DOCKER_USERNAME": project.secrets.DOCKER_USERNAME, - "DOCKER_PASSWORD": project.secrets.DOCKER_PASSWORD, - } - - job.tasks = [ - "apk --no-cache add docker", - "cd /src", - "conform enforce", - "conform build", - ] - - job.docker.enabled = true - - // Unit is milliseconds, 14400000ms = 4h. - job.timeout = 14400000 - - job.host.nodeSelector.set("node-role.kubernetes.io/ci", "") - - job.resourceRequests.memory = "8Gi"; - job.resourceRequests.cpu = "4"; - job.resourceLimits.memory = "16Gi"; - job.resourceLimits.cpu = "8"; - - return job -} - -function notify(state, msg, e, project) { - const gh = new Job(`notify-${state}`, "technosophos/github-notify:latest") - gh.env = { - GH_REPO: project.repo.name, - GH_STATE: state, - GH_DESCRIPTION: msg, - GH_CONTEXT: "brigade", - GH_TOKEN: project.secrets.GH_TOKEN, - GH_COMMIT: e.revision.commit, - GH_TARGET_URL: `https://ci.dev.autonomy.io/builds/${e.buildID}`, - } - return gh -} diff --git a/src/initramfs/go.mod b/go.mod similarity index 92% rename from src/initramfs/go.mod rename to go.mod index 963a6ed0a..1cd8e8f03 100644 --- a/src/initramfs/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/autonomy/talos/src/initramfs +module github.com/autonomy/talos require ( github.com/BurntSushi/toml v0.3.0 // indirect @@ -10,13 +10,10 @@ require ( github.com/containerd/cri v1.11.1 // indirect github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260 // indirect github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd - github.com/containers/storage v0.0.0-20180829143637-d0cb01076460 // indirect github.com/coreos/go-systemd v0.0.0-20180828140353-eee3db372b31 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.7.0-rc.0+incompatible // indirect github.com/docker/docker v1.13.1 // indirect - github.com/docker/engine-api v0.4.0 - github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-events v0.0.0-20170721190031-9461782956ad // indirect github.com/docker/go-units v0.3.3 // indirect github.com/evanphx/json-patch v4.1.0+incompatible // indirect @@ -38,7 +35,6 @@ require ( github.com/imdario/mergo v0.3.6 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect - github.com/kubernetes-incubator/cri-o v1.11.2 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect github.com/onsi/ginkgo v1.6.0 // indirect @@ -52,7 +48,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/renstrom/dedent v1.0.0 // indirect github.com/sirupsen/logrus v1.0.6 // indirect - github.com/spf13/afero v1.1.2 // indirect + github.com/spf13/afero v1.2.0 // indirect github.com/spf13/cobra v0.0.3 github.com/spf13/pflag v1.0.1 // indirect github.com/stretchr/testify v1.2.2 // indirect @@ -85,7 +81,7 @@ require ( k8s.io/kube-openapi v0.0.0-20181109181836-c59034cc13d5 // indirect k8s.io/kube-proxy v0.0.0-20181108055616-8eeec43ca7b5 // indirect k8s.io/kubelet v0.0.0-20181108055742-1ff588f76017 // indirect - k8s.io/kubernetes v1.13.1 // indirect + k8s.io/kubernetes v1.13.1 k8s.io/utils v0.0.0-20181102055113-1bd4f387aa67 // indirect sigs.k8s.io/yaml v1.1.0 // indirect ) diff --git a/src/initramfs/go.sum b/go.sum similarity index 90% rename from src/initramfs/go.sum rename to go.sum index 3e0743d0c..4071b4d4b 100644 --- a/src/initramfs/go.sum +++ b/go.sum @@ -12,26 +12,20 @@ github.com/containerd/containerd v1.2.1 h1:rG4/dK9V2qa5a9ly/E3CtG6/FBXfmSkDo8An3 github.com/containerd/containerd v1.2.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/continuity v0.0.0-20181003075958-be9bd761db19 h1:HSgjWPBWohO3kHDPwCPUGSLqJjXCjA7ad5057beR2ZU= github.com/containerd/continuity v0.0.0-20181003075958-be9bd761db19/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/cri v1.11.1 h1:mmU4M2zh6yLy2jMUAhosOOuaZRoXa1CwYIxM2zNj8iI= +github.com/containerd/cri v1.11.1 h1:mR8+eNW4zEcbWGTGEpmDd7GzMmK7IMxMSVAZ2aIDKA4= github.com/containerd/cri v1.11.1/go.mod h1:DavH5Qa8+6jOmeOMO3dhWoqksucZDe06LfuhBz/xPZs= github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260 h1:XGyg7oTtD0DoRFhbpV6x1WfV0flKC4UxXU7ab1zC08U= github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd h1:JNn81o/xG+8NEo3bC/vx9pbi/g2WI8mtP2/nXzu297Y= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/containers/storage v0.0.0-20180829143637-d0cb01076460 h1:hClnCyhG6PhaW7JSMg5kzP2WxNtbaedG9Ws0wTfsGMQ= -github.com/containers/storage v0.0.0-20180829143637-d0cb01076460/go.mod h1:+RirK6VQAqskQlaTBrOG6ulDvn4si2QjFE1NZCn06MM= github.com/coreos/go-systemd v0.0.0-20180828140353-eee3db372b31 h1:wRzCUSYhBIk1KvRIlx+nvScCRIxX0iIhSU5h9xj7MUU= github.com/coreos/go-systemd v0.0.0-20180828140353-eee3db372b31/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/distribution v2.7.0-rc.0+incompatible h1:Nw9tozLpkMnG3IA1zLzsCuwKizII6havt4iIXWWzU2s= github.com/docker/distribution v2.7.0-rc.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v1.13.1 h1:5VBhsO6ckUxB0A8CE5LlUJdXzik9cbEbBTQ/ggeml7M= +github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo= github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/engine-api v0.4.0 h1:D0Osr6+45yAlQqLyoczv5qJtAu+P0HB0rLCddck03wY= -github.com/docker/engine-api v0.4.0/go.mod h1:xtQCpzf4YysNZCVFfIGIm7qfLvYbxtLkEVVfKhTVOvw= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20170721190031-9461782956ad h1:VXIse57M5C6ezDuCPyq6QmMvEJ2xclYKZ35SfkXdm3E= github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk= @@ -78,8 +72,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPUhEF5KNCkrUyqTSA5zWUl8sQ2bfGBE= github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kubernetes-incubator/cri-o v1.11.2 h1:fFVGShhe9znd4QmLYk19zJNocapw9Mr73ISXkj+Bpes= -github.com/kubernetes-incubator/cri-o v1.11.2/go.mod h1:iVQXkISBUrMZCggYuwSRBDDZ9XoP3WzfFFYpF+/RI8g= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= @@ -106,8 +98,8 @@ github.com/renstrom/dedent v1.0.0 h1:MKUQ4Nr+V8f9ax+9wYAx5GhspvFzs47vK0oXePaVoWk github.com/renstrom/dedent v1.0.0/go.mod h1:M3t8jnE/HlAaLf3m0P158lCmrc8ZErlRB4/cN6V5TXY= github.com/sirupsen/logrus v1.0.6 h1:hcP1GmhGigz/O7h1WVUM5KklBp1JoNS9FggWKdj/j3s= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.0 h1:O9FblXGxoTc51M+cqr74Bm2Tmt4PvkA5iu/j8HrkNuY= +github.com/spf13/afero v1.2.0/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= @@ -121,16 +113,13 @@ github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9o golang.org/x/crypto v0.0.0-20180515001509-1a580b3eff78 h1:uJIReYEB1ZZLarzi83Pmig1HhZ/cwFCysx05l0PFBIk= golang.org/x/crypto v0.0.0-20180515001509-1a580b3eff78/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225 h1:kNX+jCowfMYzvlSvJu5pQWEmyWFrBXJ3PBy10xKMXK8= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc h1:a3CU5tJYVj92DY2LaA1kUkrsqD5/3mLDhx2NcNqyW+0= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced h1:4oqSq7eft7MdPKBGQK11X9WYUxmj6ZLgGTqYIbY1kyw= golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -173,9 +162,6 @@ k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476 h1:Ws9zfxsgV19 k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93 h1:tT6oQBi0qwLbbZSfDkdIsb23EwaLY85hoAV4SpXfdao= k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apiserver v0.0.0-20181110111630-c45349c92333 h1:vJS6O3laUr6RjawTCj6mGtWAtSZIj8UJHHdJkVoq8iY= -k8s.io/apiserver v0.0.0-20181110111630-c45349c92333/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= -k8s.io/apiserver v0.0.0-20181211031017-bbe3b7124d2b h1:doK90r3QcG9/+ZIBcWhPPoMv7CfRkGQVgrVAe8kFWS8= k8s.io/apiserver v0.0.0-20181213151703-3ccfe8365421 h1:NyOpnIh+7SLvC05NGCIXF9c4KhnkTZQE2SxF+m9otww= k8s.io/apiserver v0.0.0-20181213151703-3ccfe8365421/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34= @@ -190,7 +176,7 @@ k8s.io/kube-proxy v0.0.0-20181108055616-8eeec43ca7b5 h1:tM7Kt5AXss8IHvgPHoff1hyJ k8s.io/kube-proxy v0.0.0-20181108055616-8eeec43ca7b5/go.mod h1:wYVhqAVLhGBLbGzgb9GsBakzIddI81JxSUHANQvzZZs= k8s.io/kubelet v0.0.0-20181108055742-1ff588f76017 h1:Df4PBcfWHh/oi4pHC+G7mbJEKtbukYl34RDo12caUxA= k8s.io/kubelet v0.0.0-20181108055742-1ff588f76017/go.mod h1:m6JOtVhjgs4GGnzhPpXuNF9VG+IjARwo/dHCNw4+QDA= -k8s.io/kubernetes v1.13.1 h1:UGJpxWwhE/oxhHhaNgmoW/nQcdFdKETx5bV8K5FHgyk= +k8s.io/kubernetes v1.13.1 h1:IwCCcPOZwY9rKcQyBJYXAE4Wgma4oOW5NYR3HXKFfZ8= k8s.io/kubernetes v1.13.1/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20181102055113-1bd4f387aa67 h1:+kBMW7D4cSYIhPz0fVs6NRp5QILMz6+65ec4kWJOoXs= k8s.io/utils v0.0.0-20181102055113-1bd4f387aa67/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= diff --git a/hack/cis-kube-bench-master.yaml b/hack/conformance/cis/cis-kube-bench-master.yaml similarity index 100% rename from hack/cis-kube-bench-master.yaml rename to hack/conformance/cis/cis-kube-bench-master.yaml diff --git a/hack/cis-kube-bench-node.yaml b/hack/conformance/cis/cis-kube-bench-node.yaml similarity index 100% rename from hack/cis-kube-bench-node.yaml rename to hack/conformance/cis/cis-kube-bench-node.yaml diff --git a/hack/cis.sh b/hack/conformance/cis/cis.sh similarity index 100% rename from hack/cis.sh rename to hack/conformance/cis/cis.sh diff --git a/hack/sonobuoy-conformance.yaml b/hack/conformance/sonobuoy/sonobuoy-conformance.yaml similarity index 100% rename from hack/sonobuoy-conformance.yaml rename to hack/conformance/sonobuoy/sonobuoy-conformance.yaml diff --git a/hack/sonobuoy-quick.yaml b/hack/conformance/sonobuoy/sonobuoy-quick.yaml similarity index 100% rename from hack/sonobuoy-quick.yaml rename to hack/conformance/sonobuoy/sonobuoy-quick.yaml diff --git a/hack/sonobuoy.sh b/hack/conformance/sonobuoy/sonobuoy.sh similarity index 100% rename from hack/sonobuoy.sh rename to hack/conformance/sonobuoy/sonobuoy.sh diff --git a/hack/debug.yaml b/hack/debug.yaml deleted file mode 100644 index 09132483c..000000000 --- a/hack/debug.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: debug -spec: - # nodeSelector: - # kubernetes.io/hostname: ${HOSTNAME} - tolerations: - - operator: Exists - containers: - - name: debug - image: ubuntu:18.04 - command: [ "/bin/sh", "-c", "--" ] - args: [ "while true; do sleep 30; done;" ] - env: - - name: DOCKER_HOST - value: unix:///rootfs/run/docker.sock - volumeMounts: - - mountPath: /rootfs - name: root - volumes: - - name: root - hostPath: - path: / diff --git a/src/rootfs/udevd/hack/golangci-lint.yaml b/hack/golang/golangci-lint.yaml similarity index 99% rename from src/rootfs/udevd/hack/golangci-lint.yaml rename to hack/golang/golangci-lint.yaml index 71945d7b3..e54466500 100644 --- a/src/rootfs/udevd/hack/golangci-lint.yaml +++ b/hack/golang/golangci-lint.yaml @@ -100,6 +100,8 @@ linters: - gas - typecheck - megacheck + - gochecknoglobals + - gochecknoinits disable-all: false fast: false diff --git a/src/initramfs/hack/test.sh b/hack/golang/test.sh similarity index 100% rename from src/initramfs/hack/test.sh rename to hack/golang/test.sh diff --git a/src/image/src/entrypoint.sh b/hack/installer/entrypoint.sh similarity index 100% rename from src/image/src/entrypoint.sh rename to hack/installer/entrypoint.sh diff --git a/src/image/src/packer.json b/hack/installer/packer.json similarity index 100% rename from src/image/src/packer.json rename to hack/installer/packer.json diff --git a/src/rootfs/src/cleanup.sh b/hack/scripts/cleanup.sh similarity index 77% rename from src/rootfs/src/cleanup.sh rename to hack/scripts/cleanup.sh index e0f551eb5..930715d5c 100644 --- a/src/rootfs/src/cleanup.sh +++ b/hack/scripts/cleanup.sh @@ -50,17 +50,3 @@ rm -rf \ ${PREFIX}/usr/share/* \ ${PREFIX}/usr/libexec/getconf \ ${PREFIX}/var/db - -mkdir -p ${PREFIX}/usr/share -mkdir -p ${PREFIX}/usr/local/share - -paths=( /etc/pki /usr/share/ca-certificates /usr/local/share/ca-certificates /etc/ca-certificates ) -for d in "${paths[@]}"; do - ln -sv /etc/ssl/certs ${PREFIX}$d -done - -# Required by kube-proxy. -mkdir ${PREFIX}/lib/modules - -mkdir -p ${PREFIX}/usr/libexec -ln -sv ../../var/libexec/kubernetes ${PREFIX}/usr/libexec/kubernetes diff --git a/hack/push.sh b/hack/scripts/push.sh similarity index 100% rename from hack/push.sh rename to hack/scripts/push.sh diff --git a/hack/scripts/symlink.sh b/hack/scripts/symlink.sh new file mode 100644 index 000000000..8f454bbd7 --- /dev/null +++ b/hack/scripts/symlink.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +PREFIX="${1}" + +mkdir -p ${PREFIX}/usr/share +mkdir -p ${PREFIX}/usr/local/share + +paths=( /etc/pki /usr/share/ca-certificates /usr/local/share/ca-certificates /etc/ca-certificates ) +for d in "${paths[@]}"; do + ln -sv /etc/ssl/certs ${PREFIX}$d +done + +# Required by kube-proxy. +mkdir ${PREFIX}/lib/modules + +mkdir -p ${PREFIX}/usr/libexec +ln -sv ../../var/libexec/kubernetes ${PREFIX}/usr/libexec/kubernetes diff --git a/src/initramfs/cmd/blockd/pkg/reg/reg.go b/internal/app/blockd/internal/reg/reg.go similarity index 84% rename from src/initramfs/cmd/blockd/pkg/reg/reg.go rename to internal/app/blockd/internal/reg/reg.go index 4265a3034..0d261fd69 100644 --- a/src/initramfs/cmd/blockd/pkg/reg/reg.go +++ b/internal/app/blockd/internal/reg/reg.go @@ -3,8 +3,8 @@ package reg import ( "context" - "github.com/autonomy/talos/src/initramfs/cmd/blockd/proto" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/blockd/proto" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/golang/protobuf/ptypes/empty" "google.golang.org/grpc" ) diff --git a/src/initramfs/cmd/blockd/main.go b/internal/app/blockd/main.go similarity index 76% rename from src/initramfs/cmd/blockd/main.go rename to internal/app/blockd/main.go index dfcd46a11..57a759419 100644 --- a/src/initramfs/cmd/blockd/main.go +++ b/internal/app/blockd/main.go @@ -4,12 +4,12 @@ import ( "flag" "log" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/trustd/pkg/reg" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/factory" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/gen" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/tls" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/blockd/internal/reg" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/grpc/factory" + "github.com/autonomy/talos/internal/pkg/grpc/gen" + "github.com/autonomy/talos/internal/pkg/grpc/tls" + "github.com/autonomy/talos/internal/pkg/userdata" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/src/initramfs/cmd/blockd/proto/api.proto b/internal/app/blockd/proto/api.proto similarity index 100% rename from src/initramfs/cmd/blockd/proto/api.proto rename to internal/app/blockd/proto/api.proto diff --git a/src/initramfs/cmd/init/pkg/fs/xfs/util/util.go b/internal/app/init/internal/fs/xfs/util/util.go similarity index 86% rename from src/initramfs/cmd/init/pkg/fs/xfs/util/util.go rename to internal/app/init/internal/fs/xfs/util/util.go index c5767767e..bc6b53e3b 100644 --- a/src/initramfs/cmd/init/pkg/fs/xfs/util/util.go +++ b/internal/app/init/internal/fs/xfs/util/util.go @@ -5,6 +5,7 @@ import ( "strings" ) +// PartNo returns the partition number. func PartNo(partname string) string { if strings.HasPrefix(partname, "/dev/nvme") { idx := strings.Index(partname, "p") @@ -16,6 +17,7 @@ func PartNo(partname string) string { return "" } +// DevnameFromPartname returns the device name from a partition name. func DevnameFromPartname(partname, partno string) string { if strings.HasPrefix(partname, "/dev/nvme") { return strings.TrimRight(partname, "p"+partno) diff --git a/src/initramfs/cmd/init/pkg/fs/xfs/util/util_test.go b/internal/app/init/internal/fs/xfs/util/util_test.go similarity index 98% rename from src/initramfs/cmd/init/pkg/fs/xfs/util/util_test.go rename to internal/app/init/internal/fs/xfs/util/util_test.go index 6fb35bd24..aa72997a1 100644 --- a/src/initramfs/cmd/init/pkg/fs/xfs/util/util_test.go +++ b/internal/app/init/internal/fs/xfs/util/util_test.go @@ -1,3 +1,4 @@ +//nolint: scopelint package util import ( diff --git a/src/initramfs/cmd/init/pkg/fs/xfs/xfs.go b/internal/app/init/internal/fs/xfs/xfs.go similarity index 100% rename from src/initramfs/cmd/init/pkg/fs/xfs/xfs.go rename to internal/app/init/internal/fs/xfs/xfs.go diff --git a/src/initramfs/cmd/init/pkg/fs/xfs/xfs_options.go b/internal/app/init/internal/fs/xfs/xfs_options.go similarity index 100% rename from src/initramfs/cmd/init/pkg/fs/xfs/xfs_options.go rename to internal/app/init/internal/fs/xfs/xfs_options.go diff --git a/src/initramfs/cmd/init/pkg/kernel/kernel.go b/internal/app/init/internal/kernel/kernel.go similarity index 100% rename from src/initramfs/cmd/init/pkg/kernel/kernel.go rename to internal/app/init/internal/kernel/kernel.go diff --git a/src/initramfs/cmd/init/pkg/mount/blkid/blkid.go b/internal/app/init/internal/mount/blkid/blkid.go similarity index 81% rename from src/initramfs/cmd/init/pkg/mount/blkid/blkid.go rename to internal/app/init/internal/mount/blkid/blkid.go index e6a10c459..eda861538 100644 --- a/src/initramfs/cmd/init/pkg/mount/blkid/blkid.go +++ b/internal/app/init/internal/mount/blkid/blkid.go @@ -19,10 +19,14 @@ import ( ) const ( - BLKID_SUBLKS_LABEL = (1 << 1) - BLKID_SUBLKS_UUID = (1 << 3) - BLKID_SUBLKS_TYPE = (1 << 5) - BLKID_PARTS_ENTRY_DETAILS = (1 << 2) + // BlkidSublksLabel read LABEL from superblock. + BlkidSublksLabel = (1 << 1) + // BlkidSublksUUID read UUID from superblock. + BlkidSublksUUID = (1 << 3) + // BlkidSublksType reads the TYPE from superblock. + BlkidSublksType = (1 << 5) + // BlkidPartsEntryDetails reads the partition details from superblock. + BlkidPartsEntryDetails = (1 << 2) ) // GetDevWithAttribute returns the dev name of a block device matching the ATTRIBUTE=VALUE @@ -40,12 +44,12 @@ func GetDevWithAttribute(attribute, value string) (string, error) { C.blkid_probe_all(cache) - cs_attribute := C.CString(attribute) - cs_value := C.CString(value) - defer C.free(unsafe.Pointer(cs_attribute)) - defer C.free(unsafe.Pointer(cs_value)) + csAttribute := C.CString(attribute) + csValue := C.CString(value) + defer C.free(unsafe.Pointer(csAttribute)) + defer C.free(unsafe.Pointer(csValue)) - devname := C.blkid_get_devname(cache, cs_attribute, cs_value) + devname := C.blkid_get_devname(cache, csAttribute, csValue) defer C.free(unsafe.Pointer(devname)) // If you have called blkid_get_cache(), you should call blkid_put_cache() @@ -97,9 +101,9 @@ func ProbeLookupValue(pr C.blkid_probe, name string, size *int) (string, error) defer C.free(unsafe.Pointer(data)) C.blkid_probe_enable_superblocks(pr, 1) - C.blkid_probe_set_superblocks_flags(pr, BLKID_SUBLKS_LABEL|BLKID_SUBLKS_UUID|BLKID_SUBLKS_TYPE) + C.blkid_probe_set_superblocks_flags(pr, BlkidSublksLabel|BlkidSublksUUID|BlkidSublksType) C.blkid_probe_enable_partitions(pr, 1) - C.blkid_probe_set_partitions_flags(pr, BLKID_PARTS_ENTRY_DETAILS) + C.blkid_probe_set_partitions_flags(pr, BlkidPartsEntryDetails) if err := DoSafeProbe(pr); err != nil { return "", errors.Errorf("failed to do safe probe: %v", err) diff --git a/src/initramfs/cmd/init/pkg/mount/cgroups/cgroups.go b/internal/app/init/internal/mount/cgroups/cgroups.go similarity index 100% rename from src/initramfs/cmd/init/pkg/mount/cgroups/cgroups.go rename to internal/app/init/internal/mount/cgroups/cgroups.go diff --git a/src/initramfs/cmd/init/pkg/mount/mount.go b/internal/app/init/internal/mount/mount.go similarity index 94% rename from src/initramfs/cmd/init/pkg/mount/mount.go rename to internal/app/init/internal/mount/mount.go index b348e2e93..82fd810ea 100644 --- a/src/initramfs/cmd/init/pkg/mount/mount.go +++ b/internal/app/init/internal/mount/mount.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/fs/xfs" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/mount/blkid" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice" - gptpartition "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/table/gpt/partition" + "github.com/autonomy/talos/internal/app/init/internal/fs/xfs" + "github.com/autonomy/talos/internal/app/init/internal/mount/blkid" + "github.com/autonomy/talos/internal/pkg/blockdevice" + gptpartition "github.com/autonomy/talos/internal/pkg/blockdevice/table/gpt/partition" + "github.com/autonomy/talos/internal/pkg/constants" "github.com/pkg/errors" "golang.org/x/sys/unix" @@ -359,6 +359,8 @@ func ProbeDevice(devname string) (*BlockDevice, error) { } // TODO(andrewrynhard): Should we return an error here? +// TODO(andrewrynhard): Move the PartNo function in the xfs package to an +// appropriate package and use that instead of this. func partNo(partname string) string { if strings.HasPrefix(partname, "/dev/nvme") { idx := strings.Index(partname, "p") @@ -371,6 +373,8 @@ func partNo(partname string) string { } // TODO(andrewrynhard): Should we return an error here? +// TODO(andrewrynhard): Move the DevnameFromPartname function in the xfs +// package to an appropriate package and use that instead of this. func devnameFromPartname(partname string) string { partno := partNo(partname) if strings.HasPrefix(partname, "/dev/nvme") { diff --git a/src/initramfs/cmd/init/pkg/platform/baremetal/baremetal.go b/internal/app/init/internal/platform/baremetal/baremetal.go similarity index 95% rename from src/initramfs/cmd/init/pkg/platform/baremetal/baremetal.go rename to internal/app/init/internal/platform/baremetal/baremetal.go index 1c9ec7cc0..b075c7452 100644 --- a/src/initramfs/cmd/init/pkg/platform/baremetal/baremetal.go +++ b/internal/app/init/internal/platform/baremetal/baremetal.go @@ -18,16 +18,16 @@ import ( "strconv" "strings" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/fs/xfs" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/kernel" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/mount" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/mount/blkid" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/table" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/table/gpt/partition" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" - "github.com/autonomy/talos/src/initramfs/pkg/version" + "github.com/autonomy/talos/internal/app/init/internal/fs/xfs" + "github.com/autonomy/talos/internal/app/init/internal/kernel" + "github.com/autonomy/talos/internal/app/init/internal/mount" + "github.com/autonomy/talos/internal/app/init/internal/mount/blkid" + "github.com/autonomy/talos/internal/pkg/blockdevice" + "github.com/autonomy/talos/internal/pkg/blockdevice/table" + "github.com/autonomy/talos/internal/pkg/blockdevice/table/gpt/partition" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/version" "golang.org/x/sys/unix" yaml "gopkg.in/yaml.v2" ) diff --git a/src/initramfs/cmd/init/pkg/platform/baremetal/baremetal_test.go b/internal/app/init/internal/platform/baremetal/baremetal_test.go similarity index 98% rename from src/initramfs/cmd/init/pkg/platform/baremetal/baremetal_test.go rename to internal/app/init/internal/platform/baremetal/baremetal_test.go index 359fad682..3f74fecf4 100644 --- a/src/initramfs/cmd/init/pkg/platform/baremetal/baremetal_test.go +++ b/internal/app/init/internal/platform/baremetal/baremetal_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice" + "github.com/autonomy/talos/internal/pkg/blockdevice" + "github.com/autonomy/talos/internal/pkg/constants" ) // nolint: gocyclo diff --git a/src/initramfs/cmd/init/pkg/platform/baremetal/testdata/talos_test.tar.gz b/internal/app/init/internal/platform/baremetal/testdata/talos_test.tar.gz similarity index 100% rename from src/initramfs/cmd/init/pkg/platform/baremetal/testdata/talos_test.tar.gz rename to internal/app/init/internal/platform/baremetal/testdata/talos_test.tar.gz diff --git a/src/initramfs/cmd/init/pkg/platform/cloud/aws/aws.go b/internal/app/init/internal/platform/cloud/aws/aws.go similarity index 98% rename from src/initramfs/cmd/init/pkg/platform/cloud/aws/aws.go rename to internal/app/init/internal/platform/cloud/aws/aws.go index 691c9c55c..2ae785af3 100644 --- a/src/initramfs/cmd/init/pkg/platform/cloud/aws/aws.go +++ b/internal/app/init/internal/platform/cloud/aws/aws.go @@ -10,7 +10,7 @@ import ( "log" "net/http" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/fullsailor/pkcs7" "golang.org/x/sys/unix" ) diff --git a/src/initramfs/cmd/init/pkg/platform/cloud/vmware/vmware.go b/internal/app/init/internal/platform/cloud/vmware/vmware.go similarity index 90% rename from src/initramfs/cmd/init/pkg/platform/cloud/vmware/vmware.go rename to internal/app/init/internal/platform/cloud/vmware/vmware.go index c4b03f017..48d52d23c 100644 --- a/src/initramfs/cmd/init/pkg/platform/cloud/vmware/vmware.go +++ b/internal/app/init/internal/platform/cloud/vmware/vmware.go @@ -6,9 +6,9 @@ import ( "encoding/base64" "fmt" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/kernel" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/internal/kernel" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/vmware/vmw-guestinfo/rpcvmx" "github.com/vmware/vmw-guestinfo/vmcheck" yaml "gopkg.in/yaml.v2" diff --git a/src/initramfs/cmd/init/pkg/platform/platform.go b/internal/app/init/internal/platform/platform.go similarity index 70% rename from src/initramfs/cmd/init/pkg/platform/platform.go rename to internal/app/init/internal/platform/platform.go index ac806bfa7..b592f135a 100644 --- a/src/initramfs/cmd/init/pkg/platform/platform.go +++ b/internal/app/init/internal/platform/platform.go @@ -5,12 +5,12 @@ package platform import ( "fmt" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/kernel" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/platform/baremetal" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/platform/cloud/aws" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/platform/cloud/vmware" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/internal/kernel" + "github.com/autonomy/talos/internal/app/init/internal/platform/baremetal" + "github.com/autonomy/talos/internal/app/init/internal/platform/cloud/aws" + "github.com/autonomy/talos/internal/app/init/internal/platform/cloud/vmware" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" ) // Platform is an interface describing a platform. diff --git a/src/initramfs/cmd/init/pkg/rootfs/cni/cni.go b/internal/app/init/internal/rootfs/cni/cni.go similarity index 92% rename from src/initramfs/cmd/init/pkg/rootfs/cni/cni.go rename to internal/app/init/internal/rootfs/cni/cni.go index e58b45a45..0315be89c 100644 --- a/src/initramfs/cmd/init/pkg/rootfs/cni/cni.go +++ b/internal/app/init/internal/rootfs/cni/cni.go @@ -4,8 +4,8 @@ import ( "os" "path" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/src/initramfs/cmd/init/pkg/rootfs/etc/etc.go b/internal/app/init/internal/rootfs/etc/etc.go similarity index 98% rename from src/initramfs/cmd/init/pkg/rootfs/etc/etc.go rename to internal/app/init/internal/rootfs/etc/etc.go index ba8c6f809..1ca938d43 100644 --- a/src/initramfs/cmd/init/pkg/rootfs/etc/etc.go +++ b/internal/app/init/internal/rootfs/etc/etc.go @@ -11,7 +11,7 @@ import ( "strings" "text/template" - "github.com/autonomy/talos/src/initramfs/pkg/version" + "github.com/autonomy/talos/internal/pkg/version" ) const hostsTemplate = ` diff --git a/src/initramfs/cmd/init/pkg/rootfs/proc/proc.go b/internal/app/init/internal/rootfs/proc/proc.go similarity index 100% rename from src/initramfs/cmd/init/pkg/rootfs/proc/proc.go rename to internal/app/init/internal/rootfs/proc/proc.go diff --git a/src/initramfs/cmd/init/pkg/rootfs/rootfs.go b/internal/app/init/internal/rootfs/rootfs.go similarity index 87% rename from src/initramfs/cmd/init/pkg/rootfs/rootfs.go rename to internal/app/init/internal/rootfs/rootfs.go index 65b778e9d..5bcab6cec 100644 --- a/src/initramfs/cmd/init/pkg/rootfs/rootfs.go +++ b/internal/app/init/internal/rootfs/rootfs.go @@ -5,11 +5,11 @@ import ( "net" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/rootfs/cni" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/rootfs/etc" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/rootfs/proc" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/internal/rootfs/cni" + "github.com/autonomy/talos/internal/app/init/internal/rootfs/etc" + "github.com/autonomy/talos/internal/app/init/internal/rootfs/proc" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" yaml "gopkg.in/yaml.v2" ) diff --git a/src/initramfs/cmd/init/pkg/security/cis/cis.go b/internal/app/init/internal/security/cis/cis.go similarity index 98% rename from src/initramfs/cmd/init/pkg/security/cis/cis.go rename to internal/app/init/internal/security/cis/cis.go index d93641931..9de3924d4 100644 --- a/src/initramfs/cmd/init/pkg/security/cis/cis.go +++ b/internal/app/init/internal/security/cis/cis.go @@ -9,7 +9,7 @@ import ( "text/template" "time" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" + "github.com/autonomy/talos/internal/pkg/constants" "k8s.io/api/core/v1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" diff --git a/src/initramfs/cmd/init/pkg/switchroot/switchroot.go b/internal/app/init/internal/switchroot/switchroot.go similarity index 96% rename from src/initramfs/cmd/init/pkg/switchroot/switchroot.go rename to internal/app/init/internal/switchroot/switchroot.go index 0a812edf7..3016bcd81 100644 --- a/src/initramfs/cmd/init/pkg/switchroot/switchroot.go +++ b/internal/app/init/internal/switchroot/switchroot.go @@ -6,8 +6,8 @@ import ( "os" "syscall" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/mount" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/mount/cgroups" + "github.com/autonomy/talos/internal/app/init/internal/mount" + "github.com/autonomy/talos/internal/app/init/internal/mount/cgroups" "github.com/pkg/errors" "golang.org/x/sys/unix" ) diff --git a/src/initramfs/cmd/init/main.go b/internal/app/init/main.go similarity index 89% rename from src/initramfs/cmd/init/main.go rename to internal/app/init/main.go index 3a4bb73cc..90f6332a6 100644 --- a/src/initramfs/cmd/init/main.go +++ b/internal/app/init/main.go @@ -11,14 +11,14 @@ import ( "os" "time" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/mount" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/platform" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/rootfs" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/switchroot" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/services" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/internal/mount" + "github.com/autonomy/talos/internal/app/init/internal/platform" + "github.com/autonomy/talos/internal/app/init/internal/rootfs" + "github.com/autonomy/talos/internal/app/init/internal/switchroot" + "github.com/autonomy/talos/internal/app/init/pkg/system" + "github.com/autonomy/talos/internal/app/init/pkg/system/services" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/pkg/errors" "golang.org/x/sys/unix" diff --git a/src/initramfs/cmd/init/pkg/system/conditions/conditions.go b/internal/app/init/pkg/system/conditions/conditions.go similarity index 100% rename from src/initramfs/cmd/init/pkg/system/conditions/conditions.go rename to internal/app/init/pkg/system/conditions/conditions.go diff --git a/src/initramfs/cmd/init/pkg/system/runner/containerd/containerd.go b/internal/app/init/pkg/system/runner/containerd/containerd.go similarity index 90% rename from src/initramfs/cmd/init/pkg/system/runner/containerd/containerd.go rename to internal/app/init/pkg/system/runner/containerd/containerd.go index 9972c24a8..dfcaea0ef 100644 --- a/src/initramfs/cmd/init/pkg/system/runner/containerd/containerd.go +++ b/internal/app/init/pkg/system/runner/containerd/containerd.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" @@ -63,6 +63,7 @@ func (c *Containerd) Run(data *userdata.UserData, args runner.Args, setters ...r if err != nil { return err } + // nolint: errcheck defer client.Close() // Pull the image and unpack it. @@ -120,8 +121,7 @@ func newContainerOpts(image containerd.Image, args runner.Args, opts *runner.Opt containerd.WithNewSnapshot(args.ID, image), containerd.WithNewSpec(specOpts...), } - switch opts.Type { - case runner.Forever: + if opts.Type == runner.Forever { containerOpts = append(containerOpts, restart.WithStatus(containerd.Running), restart.WithLogPath(logPath(args))) } containerOpts = append(containerOpts, opts.ContainerOpts...) @@ -129,7 +129,7 @@ func newContainerOpts(image containerd.Image, args runner.Args, opts *runner.Opt return containerOpts } -func newOCISpecOpts(image containerd.Image, args runner.Args, opts *runner.Options) []oci.SpecOpts { +func newOCISpecOpts(image oci.Image, args runner.Args, opts *runner.Options) []oci.SpecOpts { specOpts := []oci.SpecOpts{ oci.WithImageConfig(image), oci.WithProcessArgs(args.ProcessArgs...), diff --git a/src/initramfs/cmd/init/pkg/system/runner/process/log/log.go b/internal/app/init/pkg/system/runner/process/log/log.go similarity index 94% rename from src/initramfs/cmd/init/pkg/system/runner/process/log/log.go rename to internal/app/init/pkg/system/runner/process/log/log.go index 6718d4311..7bc39dc44 100644 --- a/src/initramfs/cmd/init/pkg/system/runner/process/log/log.go +++ b/internal/app/init/pkg/system/runner/process/log/log.go @@ -7,7 +7,7 @@ import ( "path" "sync" - filechunker "github.com/autonomy/talos/src/initramfs/pkg/chunker/file" + filechunker "github.com/autonomy/talos/internal/pkg/chunker/file" ) var instance = map[string]*Log{} diff --git a/src/initramfs/cmd/init/pkg/system/runner/process/process.go b/internal/app/init/pkg/system/runner/process/process.go similarity index 86% rename from src/initramfs/cmd/init/pkg/system/runner/process/process.go rename to internal/app/init/pkg/system/runner/process/process.go index de9244326..5f3c5f282 100644 --- a/src/initramfs/cmd/init/pkg/system/runner/process/process.go +++ b/internal/app/init/pkg/system/runner/process/process.go @@ -8,10 +8,10 @@ import ( "os/exec" "time" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - processlogger "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/process/log" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + processlogger "github.com/autonomy/talos/internal/app/init/pkg/system/runner/process/log" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" ) // Process is a runner.Runner that runs a process on the host. @@ -42,7 +42,7 @@ func (p *Process) build(data *userdata.UserData, args *runner.Args, opts *runner cmd = exec.Command(args.ProcessArgs[0], args.ProcessArgs[1:]...) // Set the environment for the service. - cmd.Env = append(opts.Env, fmt.Sprintf("PATH=%s", constants.PATH)) + cmd.Env = append([]string{fmt.Sprintf("PATH=%s", constants.PATH)}, opts.Env...) // Setup logging. w, err := processlogger.New(args.ID) diff --git a/src/initramfs/cmd/init/pkg/system/runner/runner.go b/internal/app/init/pkg/system/runner/runner.go similarity index 97% rename from src/initramfs/cmd/init/pkg/system/runner/runner.go rename to internal/app/init/pkg/system/runner/runner.go index f40683d5a..395b24f58 100644 --- a/src/initramfs/cmd/init/pkg/system/runner/runner.go +++ b/internal/app/init/pkg/system/runner/runner.go @@ -1,7 +1,7 @@ package runner import ( - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/containerd/containerd" "github.com/containerd/containerd/oci" ) diff --git a/src/initramfs/cmd/init/pkg/system/services/blockd.go b/internal/app/init/pkg/system/services/blockd.go similarity index 84% rename from src/initramfs/cmd/init/pkg/system/services/blockd.go rename to internal/app/init/pkg/system/services/blockd.go index 27a2d686c..960ea33c7 100644 --- a/src/initramfs/cmd/init/pkg/system/services/blockd.go +++ b/internal/app/init/pkg/system/services/blockd.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/containerd" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" - "github.com/autonomy/talos/src/initramfs/pkg/version" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner/containerd" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/version" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/src/initramfs/cmd/init/pkg/system/services/containerd.go b/internal/app/init/pkg/system/services/containerd.go similarity index 81% rename from src/initramfs/cmd/init/pkg/system/services/containerd.go rename to internal/app/init/pkg/system/services/containerd.go index c6a7c6d71..b418a77e3 100644 --- a/src/initramfs/cmd/init/pkg/system/services/containerd.go +++ b/internal/app/init/pkg/system/services/containerd.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/process" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner/process" + "github.com/autonomy/talos/internal/pkg/userdata" ) // Containerd implements the Service interface. It serves as the concrete type with diff --git a/src/initramfs/cmd/init/pkg/system/services/kubeadm.go b/internal/app/init/pkg/system/services/kubeadm.go similarity index 88% rename from src/initramfs/cmd/init/pkg/system/services/kubeadm.go rename to internal/app/init/pkg/system/services/kubeadm.go index e3420ceb1..307eedf4c 100644 --- a/src/initramfs/cmd/init/pkg/system/services/kubeadm.go +++ b/internal/app/init/pkg/system/services/kubeadm.go @@ -2,6 +2,7 @@ package services import ( "context" + "errors" "fmt" "io/ioutil" "log" @@ -9,15 +10,15 @@ import ( "path" "time" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/security/cis" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/containerd" - "github.com/autonomy/talos/src/initramfs/cmd/trustd/proto" - "github.com/autonomy/talos/src/initramfs/pkg/crypto/x509" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/middleware/auth/basic" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/internal/security/cis" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner/containerd" + "github.com/autonomy/talos/internal/app/trustd/proto" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/crypto/x509" + "github.com/autonomy/talos/internal/pkg/grpc/middleware/auth/basic" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" @@ -176,7 +177,10 @@ func enforceMasterOverrides(initConfiguration *kubeadmapi.InitConfiguration) { func writeKubeadmConfig(data *userdata.UserData) (err error) { var b []byte if data.IsBootstrap() { - initConfiguration := data.Services.Kubeadm.Configuration.(*kubeadmapi.InitConfiguration) + initConfiguration, ok := data.Services.Kubeadm.Configuration.(*kubeadmapi.InitConfiguration) + if !ok { + return errors.New("expected InitConfiguration") + } initConfiguration.NodeRegistration.CRISocket = constants.ContainerdSocket enforceMasterOverrides(initConfiguration) if err = cis.EnforceMasterRequirements(initConfiguration); err != nil { @@ -187,7 +191,10 @@ func writeKubeadmConfig(data *userdata.UserData) (err error) { return err } } else { - joinConfiguration := data.Services.Kubeadm.Configuration.(*kubeadmapi.JoinConfiguration) + joinConfiguration, ok := data.Services.Kubeadm.Configuration.(*kubeadmapi.JoinConfiguration) + if !ok { + return errors.New("expected JoinConfiguration") + } joinConfiguration.NodeRegistration.CRISocket = constants.ContainerdSocket if err = cis.EnforceWorkerRequirements(joinConfiguration); err != nil { return err @@ -199,7 +206,7 @@ func writeKubeadmConfig(data *userdata.UserData) (err error) { } p := path.Dir(constants.KubeadmConfig) - if err := os.MkdirAll(p, os.ModeDir); err != nil { + if err = os.MkdirAll(p, os.ModeDir); err != nil { return fmt.Errorf("create %s: %v", p, err) } diff --git a/src/initramfs/cmd/init/pkg/system/services/kubelet.go b/internal/app/init/pkg/system/services/kubelet.go similarity index 90% rename from src/initramfs/cmd/init/pkg/system/services/kubelet.go rename to internal/app/init/pkg/system/services/kubelet.go index 3341f3b2a..9d13f09a9 100644 --- a/src/initramfs/cmd/init/pkg/system/services/kubelet.go +++ b/internal/app/init/pkg/system/services/kubelet.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/rootfs/cni" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/containerd" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/internal/rootfs/cni" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner/containerd" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/src/initramfs/cmd/init/pkg/system/services/osd.go b/internal/app/init/pkg/system/services/osd.go similarity index 85% rename from src/initramfs/cmd/init/pkg/system/services/osd.go rename to internal/app/init/pkg/system/services/osd.go index dc00aa98e..cf3fa64b3 100644 --- a/src/initramfs/cmd/init/pkg/system/services/osd.go +++ b/internal/app/init/pkg/system/services/osd.go @@ -4,12 +4,12 @@ package services import ( "fmt" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/containerd" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" - "github.com/autonomy/talos/src/initramfs/pkg/version" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner/containerd" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/version" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/src/initramfs/cmd/init/pkg/system/services/proxyd.go b/internal/app/init/pkg/system/services/proxyd.go similarity index 85% rename from src/initramfs/cmd/init/pkg/system/services/proxyd.go rename to internal/app/init/pkg/system/services/proxyd.go index bbb7cddb4..a69a2b0d5 100644 --- a/src/initramfs/cmd/init/pkg/system/services/proxyd.go +++ b/internal/app/init/pkg/system/services/proxyd.go @@ -4,11 +4,11 @@ package services import ( "fmt" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/containerd" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" - "github.com/autonomy/talos/src/initramfs/pkg/version" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner/containerd" + "github.com/autonomy/talos/internal/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/version" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/src/initramfs/cmd/init/pkg/system/services/trustd.go b/internal/app/init/pkg/system/services/trustd.go similarity index 82% rename from src/initramfs/cmd/init/pkg/system/services/trustd.go rename to internal/app/init/pkg/system/services/trustd.go index e08c408a3..13ebb602d 100644 --- a/src/initramfs/cmd/init/pkg/system/services/trustd.go +++ b/internal/app/init/pkg/system/services/trustd.go @@ -4,12 +4,12 @@ package services import ( "fmt" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/containerd" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" - "github.com/autonomy/talos/src/initramfs/pkg/version" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner/containerd" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/version" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/src/initramfs/cmd/init/pkg/system/services/udevd.go b/internal/app/init/pkg/system/services/udevd.go similarity index 79% rename from src/initramfs/cmd/init/pkg/system/services/udevd.go rename to internal/app/init/pkg/system/services/udevd.go index 76238479d..68c51508f 100644 --- a/src/initramfs/cmd/init/pkg/system/services/udevd.go +++ b/internal/app/init/pkg/system/services/udevd.go @@ -3,10 +3,10 @@ package services import ( "fmt" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/process" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner/process" + "github.com/autonomy/talos/internal/pkg/userdata" ) // Udevd implements the Service interface. It serves as the concrete type with diff --git a/src/initramfs/cmd/init/pkg/system/system.go b/internal/app/init/pkg/system/system.go similarity index 93% rename from src/initramfs/cmd/init/pkg/system/system.go rename to internal/app/init/pkg/system/system.go index f45c462e8..d6d07fe8e 100644 --- a/src/initramfs/cmd/init/pkg/system/system.go +++ b/internal/app/init/pkg/system/system.go @@ -4,8 +4,8 @@ import ( "log" "sync" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/conditions" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/init/pkg/system/conditions" + "github.com/autonomy/talos/internal/pkg/userdata" ) type singleton struct { diff --git a/src/initramfs/cmd/osctl/cmd/config.go b/internal/app/osctl/cmd/config.go similarity index 97% rename from src/initramfs/cmd/osctl/cmd/config.go rename to internal/app/osctl/cmd/config.go index 3cf9a39b1..07ea54b20 100644 --- a/src/initramfs/cmd/osctl/cmd/config.go +++ b/internal/app/osctl/cmd/config.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/config" + "github.com/autonomy/talos/internal/app/osctl/internal/client/config" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/dmesg.go b/internal/app/osctl/cmd/dmesg.go similarity index 84% rename from src/initramfs/cmd/osctl/cmd/dmesg.go rename to internal/app/osctl/cmd/dmesg.go index 33ddf7069..dd5ecf008 100644 --- a/src/initramfs/cmd/osctl/cmd/dmesg.go +++ b/internal/app/osctl/cmd/dmesg.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" + "github.com/autonomy/talos/internal/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/client" + "github.com/autonomy/talos/internal/app/osctl/internal/client" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/gen.go b/internal/app/osctl/cmd/gen.go similarity index 99% rename from src/initramfs/cmd/osctl/cmd/gen.go rename to internal/app/osctl/cmd/gen.go index b8f032def..d8f5b00e4 100644 --- a/src/initramfs/cmd/osctl/cmd/gen.go +++ b/internal/app/osctl/cmd/gen.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/autonomy/talos/src/initramfs/pkg/crypto/x509" + "github.com/autonomy/talos/internal/pkg/crypto/x509" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/inject.go b/internal/app/osctl/cmd/inject.go similarity index 96% rename from src/initramfs/cmd/osctl/cmd/inject.go rename to internal/app/osctl/cmd/inject.go index bf77dd680..439b75596 100644 --- a/src/initramfs/cmd/osctl/cmd/inject.go +++ b/internal/app/osctl/cmd/inject.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "os" - "github.com/autonomy/talos/src/initramfs/pkg/crypto/x509" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/crypto/x509" + "github.com/autonomy/talos/internal/pkg/userdata" "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" ) diff --git a/src/initramfs/cmd/osctl/cmd/kubeconfig.go b/internal/app/osctl/cmd/kubeconfig.go similarity index 82% rename from src/initramfs/cmd/osctl/cmd/kubeconfig.go rename to internal/app/osctl/cmd/kubeconfig.go index f34f8c4a4..c5f9320ae 100644 --- a/src/initramfs/cmd/osctl/cmd/kubeconfig.go +++ b/internal/app/osctl/cmd/kubeconfig.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/client" + "github.com/autonomy/talos/internal/app/osctl/internal/client" + "github.com/autonomy/talos/internal/pkg/constants" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/logs.go b/internal/app/osctl/cmd/logs.go similarity index 82% rename from src/initramfs/cmd/osctl/cmd/logs.go rename to internal/app/osctl/cmd/logs.go index 54b66207b..29490ef54 100644 --- a/src/initramfs/cmd/osctl/cmd/logs.go +++ b/internal/app/osctl/cmd/logs.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/client" - "github.com/autonomy/talos/src/initramfs/cmd/osd/proto" + "github.com/autonomy/talos/internal/app/osctl/internal/client" + "github.com/autonomy/talos/internal/app/osd/proto" + "github.com/autonomy/talos/internal/pkg/constants" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/ps.go b/internal/app/osctl/cmd/ps.go similarity index 82% rename from src/initramfs/cmd/osctl/cmd/ps.go rename to internal/app/osctl/cmd/ps.go index 58b79c029..d7772a1e7 100644 --- a/src/initramfs/cmd/osctl/cmd/ps.go +++ b/internal/app/osctl/cmd/ps.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/client" + "github.com/autonomy/talos/internal/app/osctl/internal/client" + "github.com/autonomy/talos/internal/pkg/constants" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/reboot.go b/internal/app/osctl/cmd/reboot.go similarity index 82% rename from src/initramfs/cmd/osctl/cmd/reboot.go rename to internal/app/osctl/cmd/reboot.go index d9b34b257..80e91a49d 100644 --- a/src/initramfs/cmd/osctl/cmd/reboot.go +++ b/internal/app/osctl/cmd/reboot.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/client" + "github.com/autonomy/talos/internal/app/osctl/internal/client" + "github.com/autonomy/talos/internal/pkg/constants" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/reset.go b/internal/app/osctl/cmd/reset.go similarity index 82% rename from src/initramfs/cmd/osctl/cmd/reset.go rename to internal/app/osctl/cmd/reset.go index 3f84bc847..837eeefd3 100644 --- a/src/initramfs/cmd/osctl/cmd/reset.go +++ b/internal/app/osctl/cmd/reset.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/client" + "github.com/autonomy/talos/internal/app/osctl/internal/client" + "github.com/autonomy/talos/internal/pkg/constants" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/restart.go b/internal/app/osctl/cmd/restart.go similarity index 83% rename from src/initramfs/cmd/osctl/cmd/restart.go rename to internal/app/osctl/cmd/restart.go index 03efca1c7..02200bddc 100644 --- a/src/initramfs/cmd/osctl/cmd/restart.go +++ b/internal/app/osctl/cmd/restart.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/client" - "github.com/autonomy/talos/src/initramfs/cmd/osd/proto" + "github.com/autonomy/talos/internal/app/osctl/internal/client" + "github.com/autonomy/talos/internal/app/osd/proto" + "github.com/autonomy/talos/internal/pkg/constants" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/cmd/root.go b/internal/app/osctl/cmd/root.go similarity index 100% rename from src/initramfs/cmd/osctl/cmd/root.go rename to internal/app/osctl/cmd/root.go diff --git a/src/initramfs/cmd/osctl/cmd/version.go b/internal/app/osctl/cmd/version.go similarity index 82% rename from src/initramfs/cmd/osctl/cmd/version.go rename to internal/app/osctl/cmd/version.go index bd0826f5c..ecfa22a52 100644 --- a/src/initramfs/cmd/osctl/cmd/version.go +++ b/internal/app/osctl/cmd/version.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/client" - "github.com/autonomy/talos/src/initramfs/pkg/version" + "github.com/autonomy/talos/internal/app/osctl/internal/client" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/version" "github.com/spf13/cobra" ) diff --git a/src/initramfs/cmd/osctl/pkg/client/client.go b/internal/app/osctl/internal/client/client.go similarity index 97% rename from src/initramfs/cmd/osctl/pkg/client/client.go rename to internal/app/osctl/internal/client/client.go index c5a437803..bb00760f1 100644 --- a/src/initramfs/cmd/osctl/pkg/client/client.go +++ b/internal/app/osctl/internal/client/client.go @@ -10,8 +10,8 @@ import ( "os" "text/tabwriter" - "github.com/autonomy/talos/src/initramfs/cmd/osctl/pkg/config" - "github.com/autonomy/talos/src/initramfs/cmd/osd/proto" + "github.com/autonomy/talos/internal/app/osctl/internal/client/config" + "github.com/autonomy/talos/internal/app/osd/proto" "github.com/golang/protobuf/ptypes/empty" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/src/initramfs/cmd/osctl/pkg/config/config.go b/internal/app/osctl/internal/client/config/config.go similarity index 100% rename from src/initramfs/cmd/osctl/pkg/config/config.go rename to internal/app/osctl/internal/client/config/config.go diff --git a/internal/app/osctl/main.go b/internal/app/osctl/main.go new file mode 100644 index 000000000..166c1692d --- /dev/null +++ b/internal/app/osctl/main.go @@ -0,0 +1,7 @@ +package main + +import "github.com/autonomy/talos/internal/app/osctl/cmd" + +func main() { + cmd.Execute() +} diff --git a/src/initramfs/cmd/osd/pkg/reg/reg.go b/internal/app/osd/internal/reg/reg.go similarity index 91% rename from src/initramfs/cmd/osd/pkg/reg/reg.go rename to internal/app/osd/internal/reg/reg.go index 4543b5bce..b8344d141 100644 --- a/src/initramfs/cmd/osd/pkg/reg/reg.go +++ b/internal/app/osd/internal/reg/reg.go @@ -8,15 +8,15 @@ import ( "log" "os" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner" - containerdrunner "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/containerd" - servicelog "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/system/runner/process/log" - "github.com/autonomy/talos/src/initramfs/cmd/osd/proto" - "github.com/autonomy/talos/src/initramfs/pkg/chunker" - filechunker "github.com/autonomy/talos/src/initramfs/pkg/chunker/file" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" - "github.com/autonomy/talos/src/initramfs/pkg/version" + "github.com/autonomy/talos/internal/app/init/pkg/system/runner" + containerdrunner "github.com/autonomy/talos/internal/app/init/pkg/system/runner/containerd" + servicelog "github.com/autonomy/talos/internal/app/init/pkg/system/runner/process/log" + "github.com/autonomy/talos/internal/app/osd/proto" + "github.com/autonomy/talos/internal/pkg/chunker" + filechunker "github.com/autonomy/talos/internal/pkg/chunker/file" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/version" "github.com/containerd/cgroups" "github.com/containerd/containerd" tasks "github.com/containerd/containerd/api/services/tasks/v1" @@ -63,6 +63,7 @@ func (r *Registrator) Processes(ctx context.Context, in *empty.Empty) (reply *pr if err != nil { return nil, err } + // nolint: errcheck defer client.Close() containers, err := client.Containers(ctx) processes := []*proto.Process{} @@ -126,6 +127,7 @@ func (r *Registrator) Restart(ctx context.Context, in *proto.RestartRequest) (re if err != nil { return nil, err } + // nolint: errcheck defer client.Close() task := client.TaskService() _, err = task.Kill(ctx, &tasks.KillRequest{ContainerID: in.Id, Signal: uint32(unix.SIGTERM)}) @@ -189,6 +191,7 @@ func (r *Registrator) Reset(ctx context.Context, in *empty.Empty) (reply *proto. // Reboot implements the proto.OSDServer interface. func (r *Registrator) Reboot(ctx context.Context, in *empty.Empty) (reply *proto.RebootReply, err error) { + // nolint: errcheck unix.Reboot(int(unix.LINUX_REBOOT_CMD_RESTART)) reply = &proto.RebootReply{} diff --git a/src/initramfs/cmd/osd/main.go b/internal/app/osd/main.go similarity index 76% rename from src/initramfs/cmd/osd/main.go rename to internal/app/osd/main.go index f3a1b22cb..d184c5c8c 100644 --- a/src/initramfs/cmd/osd/main.go +++ b/internal/app/osd/main.go @@ -4,12 +4,12 @@ import ( "flag" "log" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/osd/pkg/reg" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/factory" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/gen" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/tls" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/osd/internal/reg" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/grpc/factory" + "github.com/autonomy/talos/internal/pkg/grpc/gen" + "github.com/autonomy/talos/internal/pkg/grpc/tls" + "github.com/autonomy/talos/internal/pkg/userdata" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/src/initramfs/cmd/osd/proto/api.proto b/internal/app/osd/proto/api.proto similarity index 100% rename from src/initramfs/cmd/osd/proto/api.proto rename to internal/app/osd/proto/api.proto diff --git a/src/initramfs/cmd/proxyd/pkg/backend/backend.go b/internal/app/proxyd/internal/backend/backend.go similarity index 100% rename from src/initramfs/cmd/proxyd/pkg/backend/backend.go rename to internal/app/proxyd/internal/backend/backend.go diff --git a/src/initramfs/cmd/proxyd/pkg/frontend/frontend.go b/internal/app/proxyd/internal/frontend/frontend.go similarity index 97% rename from src/initramfs/cmd/proxyd/pkg/frontend/frontend.go rename to internal/app/proxyd/internal/frontend/frontend.go index cfeeb9699..306476812 100644 --- a/src/initramfs/cmd/proxyd/pkg/frontend/frontend.go +++ b/internal/app/proxyd/internal/frontend/frontend.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/autonomy/talos/src/initramfs/cmd/proxyd/pkg/backend" - pkgnet "github.com/autonomy/talos/src/initramfs/pkg/net" + "github.com/autonomy/talos/internal/app/proxyd/internal/backend" + pkgnet "github.com/autonomy/talos/internal/pkg/net" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/kubernetes" @@ -165,6 +165,7 @@ func (r *ReverseProxy) Watch() (err error) { // AddFunc is a ResourceEventHandlerFunc. func (r *ReverseProxy) AddFunc() func(obj interface{}) { return func(obj interface{}) { + // nolint: errcheck pod := obj.(*v1.Pod) if !isAPIServer(pod) { @@ -194,7 +195,9 @@ func (r *ReverseProxy) AddFunc() func(obj interface{}) { // UpdateFunc is a ResourceEventHandlerFunc. func (r *ReverseProxy) UpdateFunc() func(oldObj, newObj interface{}) { return func(oldObj, newObj interface{}) { + // nolint: errcheck old := oldObj.(*v1.Pod) + // nolint: errcheck new := newObj.(*v1.Pod) if !isAPIServer(old) { @@ -225,6 +228,7 @@ func (r *ReverseProxy) UpdateFunc() func(oldObj, newObj interface{}) { // DeleteFunc is a ResourceEventHandlerFunc. func (r *ReverseProxy) DeleteFunc() func(obj interface{}) { return func(obj interface{}) { + // nolint: errcheck pod := obj.(*v1.Pod) if !isAPIServer(pod) { diff --git a/src/initramfs/cmd/proxyd/main.go b/internal/app/proxyd/main.go similarity index 84% rename from src/initramfs/cmd/proxyd/main.go rename to internal/app/proxyd/main.go index b38e8ad09..c29acd628 100644 --- a/src/initramfs/cmd/proxyd/main.go +++ b/internal/app/proxyd/main.go @@ -3,7 +3,7 @@ package main import ( "log" - "github.com/autonomy/talos/src/initramfs/cmd/proxyd/pkg/frontend" + "github.com/autonomy/talos/internal/app/proxyd/internal/frontend" ) func main() { diff --git a/src/initramfs/cmd/trustd/pkg/reg/reg.go b/internal/app/trustd/internal/reg/reg.go similarity index 93% rename from src/initramfs/cmd/trustd/pkg/reg/reg.go rename to internal/app/trustd/internal/reg/reg.go index 6df0377a0..c74f8d4cf 100644 --- a/src/initramfs/cmd/trustd/pkg/reg/reg.go +++ b/internal/app/trustd/internal/reg/reg.go @@ -11,9 +11,9 @@ import ( "path" "time" - "github.com/autonomy/talos/src/initramfs/cmd/trustd/proto" - "github.com/autonomy/talos/src/initramfs/pkg/crypto/x509" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/trustd/proto" + "github.com/autonomy/talos/internal/pkg/crypto/x509" + "github.com/autonomy/talos/internal/pkg/userdata" "google.golang.org/grpc" ) diff --git a/src/initramfs/cmd/trustd/main.go b/internal/app/trustd/main.go similarity index 72% rename from src/initramfs/cmd/trustd/main.go rename to internal/app/trustd/main.go index 45dfa3e71..4dbf9216f 100644 --- a/src/initramfs/cmd/trustd/main.go +++ b/internal/app/trustd/main.go @@ -4,12 +4,12 @@ import ( "flag" "log" - "github.com/autonomy/talos/src/initramfs/cmd/init/pkg/constants" - "github.com/autonomy/talos/src/initramfs/cmd/trustd/pkg/reg" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/factory" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/middleware/auth/basic" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/tls" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/trustd/internal/reg" + "github.com/autonomy/talos/internal/pkg/constants" + "github.com/autonomy/talos/internal/pkg/grpc/factory" + "github.com/autonomy/talos/internal/pkg/grpc/middleware/auth/basic" + "github.com/autonomy/talos/internal/pkg/grpc/tls" + "github.com/autonomy/talos/internal/pkg/userdata" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/src/initramfs/cmd/trustd/proto/api.proto b/internal/app/trustd/proto/api.proto similarity index 100% rename from src/initramfs/cmd/trustd/proto/api.proto rename to internal/app/trustd/proto/api.proto diff --git a/src/rootfs/udevd/pkg/drivers/scsi/scsi.go b/internal/app/udevd/internal/drivers/scsi/scsi.go similarity index 100% rename from src/rootfs/udevd/pkg/drivers/scsi/scsi.go rename to internal/app/udevd/internal/drivers/scsi/scsi.go diff --git a/src/rootfs/udevd/pkg/uevent/uevent.go b/internal/app/udevd/internal/uevent/uevent.go similarity index 100% rename from src/rootfs/udevd/pkg/uevent/uevent.go rename to internal/app/udevd/internal/uevent/uevent.go diff --git a/src/rootfs/udevd/main.go b/internal/app/udevd/main.go similarity index 93% rename from src/rootfs/udevd/main.go rename to internal/app/udevd/main.go index 7f54b543b..f20dfa563 100644 --- a/src/rootfs/udevd/main.go +++ b/internal/app/udevd/main.go @@ -8,8 +8,8 @@ import ( "os" "path" - "github.com/autonomy/talos/src/rootfs/udevd/pkg/drivers/scsi" - "github.com/autonomy/talos/src/rootfs/udevd/pkg/uevent" + "github.com/autonomy/talos/internal/app/udevd/internal/drivers/scsi" + "github.com/autonomy/talos/internal/app/udevd/internal/uevent" "github.com/pkg/errors" ) @@ -40,8 +40,7 @@ func watch() error { // nolint: gocyclo func handle(message *uevent.Message) (err error) { - switch message.Subsystem { - case uevent.SubsystemBlock: + if message.Subsystem == uevent.SubsystemBlock { var devname, devtype, partn string var ok bool diff --git a/src/initramfs/pkg/blockdevice/blockdevice.go b/internal/pkg/blockdevice/blockdevice.go similarity index 94% rename from src/initramfs/pkg/blockdevice/blockdevice.go rename to internal/pkg/blockdevice/blockdevice.go index 72bb267ff..2922ab248 100644 --- a/src/initramfs/pkg/blockdevice/blockdevice.go +++ b/internal/pkg/blockdevice/blockdevice.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/table" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/table/gpt" + "github.com/autonomy/talos/internal/pkg/blockdevice/table" + "github.com/autonomy/talos/internal/pkg/blockdevice/table/gpt" "github.com/pkg/errors" "golang.org/x/sys/unix" diff --git a/src/initramfs/pkg/blockdevice/bockdevice_options.go b/internal/pkg/blockdevice/bockdevice_options.go similarity index 100% rename from src/initramfs/pkg/blockdevice/bockdevice_options.go rename to internal/pkg/blockdevice/bockdevice_options.go diff --git a/src/initramfs/pkg/blockdevice/pkg/lba/lba.go b/internal/pkg/blockdevice/pkg/lba/lba.go similarity index 100% rename from src/initramfs/pkg/blockdevice/pkg/lba/lba.go rename to internal/pkg/blockdevice/pkg/lba/lba.go diff --git a/src/initramfs/pkg/blockdevice/pkg/serde/serde.go b/internal/pkg/blockdevice/pkg/serde/serde.go similarity index 100% rename from src/initramfs/pkg/blockdevice/pkg/serde/serde.go rename to internal/pkg/blockdevice/pkg/serde/serde.go diff --git a/src/initramfs/pkg/blockdevice/table/gpt/gpt.go b/internal/pkg/blockdevice/table/gpt/gpt.go similarity index 95% rename from src/initramfs/pkg/blockdevice/table/gpt/gpt.go rename to internal/pkg/blockdevice/table/gpt/gpt.go index 45a05f80e..34ab4fa41 100644 --- a/src/initramfs/pkg/blockdevice/table/gpt/gpt.go +++ b/internal/pkg/blockdevice/table/gpt/gpt.go @@ -7,11 +7,11 @@ import ( "syscall" "unsafe" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/pkg/lba" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/pkg/serde" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/table" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/table/gpt/header" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/table/gpt/partition" + "github.com/autonomy/talos/internal/pkg/blockdevice/pkg/lba" + "github.com/autonomy/talos/internal/pkg/blockdevice/pkg/serde" + "github.com/autonomy/talos/internal/pkg/blockdevice/table" + "github.com/autonomy/talos/internal/pkg/blockdevice/table/gpt/header" + "github.com/autonomy/talos/internal/pkg/blockdevice/table/gpt/partition" "github.com/google/uuid" "github.com/pkg/errors" "golang.org/x/sys/unix" @@ -123,10 +123,7 @@ func (gpt *GPT) New() (table.PartitionTable, error) { if err != nil { return nil, err } - pmbr, err := gpt.newPMBR(h) - if err != nil { - return nil, err - } + pmbr := gpt.newPMBR(h) gpt.header = h gpt.partitions = []table.Partition{} @@ -168,7 +165,7 @@ func (gpt *GPT) newHeader(size int64) (*header.Header, error) { // - https://en.wikipedia.org/wiki/GUID_Partition_Table#Protective_MBR_(LBA_0) // - https://www.syslinux.org/wiki/index.php?title=Doc/gpt // - https://en.wikipedia.org/wiki/Master_boot_record -func (gpt *GPT) newPMBR(h *header.Header) ([]byte, error) { +func (gpt *GPT) newPMBR(h *header.Header) []byte { pmbr := make([]byte, 512) // Boot signature. @@ -183,7 +180,7 @@ func (gpt *GPT) newPMBR(h *header.Header) ([]byte, error) { // Partition length in sectors. binary.LittleEndian.PutUint32(b[12:16], uint32(h.BackupLBA)) - return pmbr, nil + return pmbr } // Write the primary table. diff --git a/src/initramfs/pkg/blockdevice/table/gpt/gpt_options.go b/internal/pkg/blockdevice/table/gpt/gpt_options.go similarity index 100% rename from src/initramfs/pkg/blockdevice/table/gpt/gpt_options.go rename to internal/pkg/blockdevice/table/gpt/gpt_options.go diff --git a/src/initramfs/pkg/blockdevice/table/gpt/header/header.go b/internal/pkg/blockdevice/table/gpt/header/header.go similarity index 98% rename from src/initramfs/pkg/blockdevice/table/gpt/header/header.go rename to internal/pkg/blockdevice/table/gpt/header/header.go index 870d08509..0bac0ec75 100644 --- a/src/initramfs/pkg/blockdevice/table/gpt/header/header.go +++ b/internal/pkg/blockdevice/table/gpt/header/header.go @@ -7,8 +7,8 @@ import ( "fmt" "hash/crc32" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/pkg/lba" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/pkg/serde" + "github.com/autonomy/talos/internal/pkg/blockdevice/pkg/lba" + "github.com/autonomy/talos/internal/pkg/blockdevice/pkg/serde" "github.com/google/uuid" ) diff --git a/src/initramfs/pkg/blockdevice/table/gpt/header/header_options.go b/internal/pkg/blockdevice/table/gpt/header/header_options.go similarity index 100% rename from src/initramfs/pkg/blockdevice/table/gpt/header/header_options.go rename to internal/pkg/blockdevice/table/gpt/header/header_options.go diff --git a/src/initramfs/pkg/blockdevice/table/gpt/partition/partition.go b/internal/pkg/blockdevice/table/gpt/partition/partition.go similarity index 98% rename from src/initramfs/pkg/blockdevice/table/gpt/partition/partition.go rename to internal/pkg/blockdevice/table/gpt/partition/partition.go index e3119d08f..df4d64b21 100644 --- a/src/initramfs/pkg/blockdevice/table/gpt/partition/partition.go +++ b/internal/pkg/blockdevice/table/gpt/partition/partition.go @@ -6,7 +6,7 @@ import ( "encoding/binary" "fmt" - "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/pkg/serde" + "github.com/autonomy/talos/internal/pkg/blockdevice/pkg/serde" "github.com/google/uuid" "golang.org/x/text/encoding/unicode" ) diff --git a/src/initramfs/pkg/blockdevice/table/gpt/partition/partition_options.go b/internal/pkg/blockdevice/table/gpt/partition/partition_options.go similarity index 100% rename from src/initramfs/pkg/blockdevice/table/gpt/partition/partition_options.go rename to internal/pkg/blockdevice/table/gpt/partition/partition_options.go diff --git a/src/initramfs/pkg/blockdevice/table/table.go b/internal/pkg/blockdevice/table/table.go similarity index 96% rename from src/initramfs/pkg/blockdevice/table/table.go rename to internal/pkg/blockdevice/table/table.go index acac328aa..903ef5a2f 100644 --- a/src/initramfs/pkg/blockdevice/table/table.go +++ b/internal/pkg/blockdevice/table/table.go @@ -1,7 +1,7 @@ // Package table provides a library for working with block device partition tables. package table -import "github.com/autonomy/talos/src/initramfs/pkg/blockdevice/pkg/serde" +import "github.com/autonomy/talos/internal/pkg/blockdevice/pkg/serde" // Table represents a partition table. type Table = []byte diff --git a/src/initramfs/pkg/chunker/chunker.go b/internal/pkg/chunker/chunker.go similarity index 100% rename from src/initramfs/pkg/chunker/chunker.go rename to internal/pkg/chunker/chunker.go diff --git a/src/initramfs/pkg/chunker/file/file.go b/internal/pkg/chunker/file/file.go similarity index 96% rename from src/initramfs/pkg/chunker/file/file.go rename to internal/pkg/chunker/file/file.go index 5ebc8e117..fa0d6bc90 100644 --- a/src/initramfs/pkg/chunker/file/file.go +++ b/internal/pkg/chunker/file/file.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/autonomy/talos/src/initramfs/pkg/chunker" + "github.com/autonomy/talos/internal/pkg/chunker" ) // Options is the functional options struct. diff --git a/src/initramfs/pkg/chunker/stream/stream.go b/internal/pkg/chunker/stream/stream.go similarity index 96% rename from src/initramfs/pkg/chunker/stream/stream.go rename to internal/pkg/chunker/stream/stream.go index 9745486ba..d31d05624 100644 --- a/src/initramfs/pkg/chunker/stream/stream.go +++ b/internal/pkg/chunker/stream/stream.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/autonomy/talos/src/initramfs/pkg/chunker" + "github.com/autonomy/talos/internal/pkg/chunker" ) // Options is the functional options struct. diff --git a/src/initramfs/cmd/init/pkg/constants/constants.go b/internal/pkg/constants/constants.go similarity index 100% rename from src/initramfs/cmd/init/pkg/constants/constants.go rename to internal/pkg/constants/constants.go diff --git a/src/initramfs/pkg/crypto/x509/x509.go b/internal/pkg/crypto/x509/x509.go similarity index 100% rename from src/initramfs/pkg/crypto/x509/x509.go rename to internal/pkg/crypto/x509/x509.go diff --git a/src/initramfs/pkg/grpc/factory/factory.go b/internal/pkg/grpc/factory/factory.go similarity index 100% rename from src/initramfs/pkg/grpc/factory/factory.go rename to internal/pkg/grpc/factory/factory.go diff --git a/src/initramfs/pkg/grpc/gen/gen.go b/internal/pkg/grpc/gen/gen.go similarity index 90% rename from src/initramfs/pkg/grpc/gen/gen.go rename to internal/pkg/grpc/gen/gen.go index 6ab39417d..f9dee1637 100644 --- a/src/initramfs/pkg/grpc/gen/gen.go +++ b/internal/pkg/grpc/gen/gen.go @@ -9,11 +9,11 @@ import ( stdlibnet "net" "time" - "github.com/autonomy/talos/src/initramfs/cmd/trustd/proto" - "github.com/autonomy/talos/src/initramfs/pkg/crypto/x509" - "github.com/autonomy/talos/src/initramfs/pkg/grpc/middleware/auth/basic" - "github.com/autonomy/talos/src/initramfs/pkg/net" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/app/trustd/proto" + "github.com/autonomy/talos/internal/pkg/crypto/x509" + "github.com/autonomy/talos/internal/pkg/grpc/middleware/auth/basic" + "github.com/autonomy/talos/internal/pkg/net" + "github.com/autonomy/talos/internal/pkg/userdata" "google.golang.org/grpc" ) diff --git a/src/initramfs/pkg/grpc/middleware/auth/basic/basic.go b/internal/pkg/grpc/middleware/auth/basic/basic.go similarity index 100% rename from src/initramfs/pkg/grpc/middleware/auth/basic/basic.go rename to internal/pkg/grpc/middleware/auth/basic/basic.go diff --git a/src/initramfs/pkg/grpc/middleware/log/log.go b/internal/pkg/grpc/middleware/log/log.go similarity index 100% rename from src/initramfs/pkg/grpc/middleware/log/log.go rename to internal/pkg/grpc/middleware/log/log.go diff --git a/src/initramfs/pkg/grpc/tls/tls.go b/internal/pkg/grpc/tls/tls.go similarity index 96% rename from src/initramfs/pkg/grpc/tls/tls.go rename to internal/pkg/grpc/tls/tls.go index eb6c8f2b1..5d45838e9 100644 --- a/src/initramfs/pkg/grpc/tls/tls.go +++ b/internal/pkg/grpc/tls/tls.go @@ -5,7 +5,7 @@ import ( "crypto/x509" "fmt" - "github.com/autonomy/talos/src/initramfs/pkg/userdata" + "github.com/autonomy/talos/internal/pkg/userdata" ) // Type represents the TLS authentication type. diff --git a/src/initramfs/pkg/net/net.go b/internal/pkg/net/net.go similarity index 100% rename from src/initramfs/pkg/net/net.go rename to internal/pkg/net/net.go diff --git a/src/initramfs/pkg/userdata/userdata.go b/internal/pkg/userdata/userdata.go similarity index 97% rename from src/initramfs/pkg/userdata/userdata.go rename to internal/pkg/userdata/userdata.go index d35727aba..94e51c104 100644 --- a/src/initramfs/pkg/userdata/userdata.go +++ b/internal/pkg/userdata/userdata.go @@ -1,6 +1,7 @@ package userdata import ( + "errors" "fmt" "io/ioutil" "log" @@ -10,7 +11,7 @@ import ( "path" "time" - "github.com/autonomy/talos/src/initramfs/pkg/crypto/x509" + "github.com/autonomy/talos/internal/pkg/crypto/x509" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" @@ -179,7 +180,10 @@ func (kdm *Kubeadm) UnmarshalYAML(unmarshal func(interface{}) error) error { } kdm.Configuration = cfg kdm.bootstrap = false - joinConfiguration := cfg.(*kubeadm.JoinConfiguration) + joinConfiguration, ok := cfg.(*kubeadm.JoinConfiguration) + if !ok { + return errors.New("expected JoinConfiguration") + } if joinConfiguration.ControlPlane == nil { kdm.controlPlane = false } else { diff --git a/src/initramfs/pkg/userdata/testdata/userdata.yaml b/internal/pkg/userdata/userdata_test.go old mode 100755 new mode 100644 similarity index 94% rename from src/initramfs/pkg/userdata/testdata/userdata.yaml rename to internal/pkg/userdata/userdata_test.go index 4a8d8750f..fe342538f --- a/src/initramfs/pkg/userdata/testdata/userdata.yaml +++ b/internal/pkg/userdata/userdata_test.go @@ -1,4 +1,14 @@ -version: "" +package userdata + +import ( + "log" + "net/http" + "net/http/httptest" + "testing" +) + +// nolint: lll +const testConfig = `version: "" security: os: ca: @@ -82,4 +92,32 @@ install: data: device: /dev/sda size: 1024000000 +` +func TestDownloadRetry(t *testing.T) { + ts := testUDServer() + defer ts.Close() + + _, err := Download(ts.URL) + if err != nil { + t.Error("Failed to download userdata", err) + } +} + +func testUDServer() *httptest.Server { + var count int + + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + count++ + log.Printf("Request %d\n", count) + if count == 4 { + // nolint: errcheck + w.Write([]byte(testConfig)) + return + } + w.WriteHeader(http.StatusInternalServerError) + return + })) + + return ts +} diff --git a/src/initramfs/pkg/version/version.go b/internal/pkg/version/version.go similarity index 100% rename from src/initramfs/pkg/version/version.go rename to internal/pkg/version/version.go diff --git a/src/docs/.conform.yaml b/src/docs/.conform.yaml deleted file mode 100644 index bf1659b1a..000000000 --- a/src/docs/.conform.yaml +++ /dev/null @@ -1,21 +0,0 @@ -metadata: - repository: talos/docs -pipeline: - stages: - - build -stages: - build: - artifacts: - - source: /src/github.com/autonomy/talos/src/public/ - destination: ../../docs - tasks: - - docs -tasks: - docs: - template: | - FROM golang:1.11.0 as docs - WORKDIR /src/github.com/autonomy/talos - RUN curl -L https://github.com/gohugoio/hugo/releases/download/v0.49.2/hugo_0.49.2_Linux-64bit.tar.gz | tar -xz -C /bin - COPY ./src ./src - RUN cd ./src && hugo --verbose - RUN echo "talos.autonomy.io" > /src/github.com/autonomy/talos/src/public/CNAME diff --git a/src/image/.conform.yaml b/src/image/.conform.yaml deleted file mode 100644 index 906776369..000000000 --- a/src/image/.conform.yaml +++ /dev/null @@ -1,76 +0,0 @@ -metadata: - repository: autonomy/talos - variables: - srcPacker: https://releases.hashicorp.com/packer/1.3.1/packer_1.3.1_linux_amd64.zip - srcSyslinux: https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.03.tar.xz -script: - template: | - #!/bin/sh - - set -e - - docker save {{ .Docker.Image.Name }}:{{ .Docker.Image.Tag }} -o ../../build/talos.tar - - {{ if and (.Git.IsClean) (or (.Git.IsTag) (eq .Git.Branch "master")) }} - docker login --username=$DOCKER_USERNAME --password=$DOCKER_PASSWORD - docker tag {{ .Docker.Image.Name }}:{{ .Docker.Image.Tag }} {{ .Docker.Image.Name }}:latest - docker push {{ .Docker.Image.Name }}:{{ .Docker.Image.Tag }} - docker push {{ .Docker.Image.Name }}:latest - {{ if .Git.IsTag }} - docker tag {{ .Docker.Image.Name }}:{{ .Docker.Image.Tag }} {{ .Docker.Image.Name }}:{{ .Version.Original }} - docker push {{ .Docker.Image.Name }}:{{ .Version.Original }} - {{ end }} - {{ end }} -pipeline: - stages: - - generate -stages: - generate: - artifacts: - - source: /generated/rootfs.tar.gz - destination: ../../build/rootfs.tar.gz - - source: /generated/boot/vmlinuz - destination: ../../build/vmlinuz - - source: /generated/boot/initramfs.xz - destination: ../../build/initramfs.xz - tasks: - - base - - rootfs - - boot - - image -tasks: - base: - template: | - FROM alpine:3.7 AS generated - RUN apk --update add curl tar xz - WORKDIR /usr/local/src/syslinux - RUN curl -L {{ index .Variables "srcSyslinux" }} | tar --strip-components=1 -xJ - WORKDIR / - boot: - template: | - COPY --from=autonomy/kernel:e18620a /vmlinuz /generated/boot/vmlinuz - COPY --from=talos/initramfs:{{ .Docker.Image.Tag }} /tmp/initramfs.xz /generated/boot/initramfs.xz - image: - template: | - FROM alpine:3.7 - RUN apk --update add bash curl gzip e2fsprogs tar cdrkit parted syslinux util-linux xfsprogs xz sgdisk sfdisk qemu-img unzip - COPY --from=generated /usr/local/src/syslinux /usr/local/src/syslinux - COPY --from=generated /generated/rootfs.tar.gz /generated/rootfs.tar.gz - COPY --from=generated /generated/boot /generated/boot - RUN curl -L {{ index .Variables "srcPacker" }} -o /tmp/packer.zip \ - && unzip -d /tmp /tmp/packer.zip \ - && mv /tmp/packer /bin \ - && rm /tmp/packer.zip - COPY src/packer.json /packer.json - COPY src/entrypoint.sh /bin/entrypoint.sh - RUN chmod +x /bin/entrypoint.sh - {{ if and .Git.IsClean .Git.IsTag }} - ENV VERSION {{ .Git.Tag }} - {{ else }} - ENV VERSION {{ .Git.SHA }} - {{ end }} - ENTRYPOINT ["entrypoint.sh"] - rootfs: - template: | - COPY --from=talos/rootfs:{{ .Docker.Image.Tag }} /rootfs /generated/rootfs - RUN tar -cvpzf /generated/rootfs.tar.gz -C /generated/rootfs . diff --git a/src/initramfs/.conform.yaml b/src/initramfs/.conform.yaml deleted file mode 100644 index fc619215b..000000000 --- a/src/initramfs/.conform.yaml +++ /dev/null @@ -1,283 +0,0 @@ -metadata: - repository: talos/initramfs - variables: - rootfs: /rootfs - versionPath: github.com/autonomy/talos/src/initramfs/pkg/version - srcXfsprogs: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.18.0.tar.xz -script: - template: | - #!/bin/sh - - set -e - - docker tag {{ .Repository }}:osd autonomy/osd:{{ .Git.SHA }} - docker save autonomy/osd:{{ .Git.SHA }} -o ../../build/osd.tar - - docker tag {{ .Repository }}:trustd autonomy/trustd:{{ .Git.SHA }} - docker save autonomy/trustd:{{ .Git.SHA }} -o ../../build/trustd.tar - - docker tag {{ .Repository }}:proxyd autonomy/proxyd:{{ .Git.SHA }} - docker save autonomy/proxyd:{{ .Git.SHA }} -o ../../build/proxyd.tar - - docker tag {{ .Repository }}:blockd autonomy/blockd:{{ .Git.SHA }} - docker save autonomy/blockd:{{ .Git.SHA }} -o ../../build/blockd.tar - - {{ if and (.Git.IsClean) (or (.Git.IsTag) (eq .Git.Branch "master")) }} - docker login --username=$DOCKER_USERNAME --password=$DOCKER_PASSWORD - - docker tag autonomy/osd:{{ .Git.SHA }} autonomy/osd:latest - docker push autonomy/osd:{{ .Git.SHA }} - docker push autonomy/osd:latest - - docker tag autonomy/trustd:{{ .Git.SHA }} autonomy/trustd:latest - docker push autonomy/trustd:{{ .Git.SHA }} - docker push autonomy/trustd:latest - - docker tag autonomy/proxyd:{{ .Git.SHA }} autonomy/proxyd:latest - docker push autonomy/proxyd:{{ .Git.SHA }} - docker push autonomy/proxyd:latest - - docker tag autonomy/blockd:{{ .Git.SHA }} autonomy/blockd:latest - docker push autonomy/blockd:{{ .Git.SHA }} - docker push autonomy/blockd:latest - {{ end }} -pipeline: - stages: - - generate - - base - - initramfs - - osd - - osctl - - trustd - - proxyd - - blockd - - test - - image -stages: - base: - artifacts: - - source: /src/github.com/autonomy/talos/src/initramfs/vendor - destination: ./vendor - tasks: - - xfsprogs - - src - osd: - tasks: - - osd - osctl: - artifacts: - - source: /osctl-linux-amd64 - destination: ../../build/osctl-linux-amd64 - - source: /osctl-darwin-amd64 - destination: ../../build/osctl-darwin-amd64 - tasks: - - osctl - trustd: - tasks: - - trustd - proxyd: - tasks: - - proxyd - blockd: - tasks: - - blockd - initramfs: - tasks: - - init - - initramfs - image: - tasks: - - image - generate: - artifacts: - - source: /src/github.com/autonomy/talos/src/initramfs/cmd/osd/proto - destination: ./cmd/osd/proto - - source: /src/github.com/autonomy/talos/src/initramfs/cmd/trustd/proto - destination: ./cmd/trustd/proto - - source: /src/github.com/autonomy/talos/src/initramfs/cmd/blockd/proto - destination: ./cmd/blockd/proto - tasks: - - proto - test: - tasks: - - test -tasks: - blockd: - template: | - FROM {{ .Repository }}:base AS {{ .Docker.CurrentStage }} - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/{{ .Docker.CurrentStage }} - {{ if and .Git.IsClean .Git.IsTag }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Blockd -X {{ index .Variables "versionPath" }}.Tag={{ .Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X \"{{ index .Variables "versionPath" }}.Built={{ .Built }}\"" \ - -o /{{ .Docker.CurrentStage }} - {{ else }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Blockd -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ - -o /{{ .Docker.CurrentStage }} - {{ end }} - RUN chmod +x /{{ .Docker.CurrentStage }} - FROM scratch - COPY --from={{ .Docker.CurrentStage }} /{{ .Docker.CurrentStage }} /{{ .Docker.CurrentStage }} - ENTRYPOINT ["/{{ .Docker.CurrentStage }}"] - image: - template: | - FROM scratch - WORKDIR /tmp - COPY --from=talos/initramfs:initramfs /initramfs/initramfs.xz initramfs.xz - CMD false - init: - template: | - FROM {{ .Repository }}:base AS {{ .Docker.CurrentStage }} - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/{{ .Docker.CurrentStage }} - {{ if and .Git.IsClean .Git.IsTag }} - RUN GOOS=linux GOARCH=amd64 go build \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Talos -X {{ index .Variables "versionPath" }}.Tag={{ .Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X \"{{ index .Variables "versionPath" }}.Built={{ .Built }}\"" \ - -o /initramfs/init - {{ else }} - RUN GOOS=linux GOARCH=amd64 go build \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Talos -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ - -o /initramfs/init - {{ end }} - RUN chmod +x /initramfs/init - RUN mkdir -p /initramfs/lib \ - && cp /toolchain/lib/libblkid.* /initramfs/lib \ - && cp /toolchain/lib/libuuid.* /initramfs/lib - initramfs: - template: | - WORKDIR /initramfs - RUN cp -R {{ index .Variables "rootfs" }}/* ./ - RUN find . 2>/dev/null | cpio -H newc -o | xz -v -C crc32 -0 -e -T 0 -z >/tmp/initramfs.xz - RUN cp /tmp/initramfs.xz . - osctl: - template: | - FROM {{ .Repository }}:base AS {{ .Docker.CurrentStage }} - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/{{ .Docker.CurrentStage }} - {{ if and .Git.IsClean .Git.IsTag }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag={{ .Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X \"{{ index .Variables "versionPath" }}.Built={{ .Built }}\"" \ - -o /{{ .Docker.CurrentStage }}-linux-amd64 - RUN GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag={{ .Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X \"{{ index .Variables "versionPath" }}.Built={{ .Built }}\"" \ - -o /{{ .Docker.CurrentStage }}-darwin-amd64 - {{ else }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ - -o /{{ .Docker.CurrentStage }}-linux-amd64 - RUN GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ - -o /{{ .Docker.CurrentStage }}-darwin-amd64 - {{ end }} - RUN chmod +x /{{ .Docker.CurrentStage }}-linux-amd64 - RUN chmod +x /{{ .Docker.CurrentStage }}-darwin-amd64 - CMD false - osd: - template: | - FROM {{ .Repository }}:base AS {{ .Docker.CurrentStage }} - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/{{ .Docker.CurrentStage }} - {{ if and .Git.IsClean .Git.IsTag }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Server -X {{ index .Variables "versionPath" }}.Tag={{ .Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X \"{{ index .Variables "versionPath" }}.Built={{ .Built }}\"" \ - -o /{{ .Docker.CurrentStage }} - {{ else }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Server -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ - -o /{{ .Docker.CurrentStage }} - {{ end }} - RUN chmod +x /{{ .Docker.CurrentStage }} - FROM scratch - COPY --from={{ .Docker.CurrentStage }} /{{ .Docker.CurrentStage }} /{{ .Docker.CurrentStage }} - ENTRYPOINT ["/{{ .Docker.CurrentStage }}"] - proto: - template: | - FROM golang:1.11.2 AS {{ .Docker.CurrentStage }} - RUN apt-get update - RUN apt-get -y install bsdtar - WORKDIR /go/src/github.com/golang/protobuf - RUN curl -L https://github.com/golang/protobuf/archive/v1.2.0.tar.gz | tar -xz --strip-components=1 - RUN cd protoc-gen-go && go install . - RUN curl -L https://github.com/google/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip | bsdtar -xf - -C /tmp \ - && mv /tmp/bin/protoc /bin \ - && mv /tmp/include/* /usr/local/include \ - && chmod +x /bin/protoc - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/osd - COPY ./cmd/osd/proto ./proto - RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/trustd - COPY ./cmd/trustd/proto ./proto - RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/blockd - COPY ./cmd/blockd/proto ./proto - RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto - proxyd: - template: | - FROM {{ .Repository }}:base AS {{ .Docker.CurrentStage }} - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/{{ .Docker.CurrentStage }} - {{ if and .Git.IsClean .Git.IsTag }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Proxyd -X {{ index .Variables "versionPath" }}.Tag={{ .Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X \"{{ index .Variables "versionPath" }}.Built={{ .Built }}\"" \ - -o /{{ .Docker.CurrentStage }} - {{ else }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Proxyd -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ - -o /{{ .Docker.CurrentStage }} - {{ end }} - RUN chmod +x /{{ .Docker.CurrentStage }} - FROM scratch - COPY --from={{ .Docker.CurrentStage }} /{{ .Docker.CurrentStage }} /{{ .Docker.CurrentStage }} - ENTRYPOINT ["/{{ .Docker.CurrentStage }}"] - src: - template: | - FROM autonomy/toolchain:690a03a AS {{ .Docker.CurrentStage }} - RUN ln -s /toolchain/lib64 /lib64 - RUN mkdir -p /etc/ssl/certs - RUN ln -s /toolchain/etc/ssl/certs/ca-certificates /etc/ssl/certs/ca-certificates - RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.10.1 - ENV GO111MODULE on - WORKDIR /src/github.com/autonomy/talos/src/initramfs - COPY --from=xfsprogs {{ index .Variables "rootfs" }} {{ index .Variables "rootfs" }} - COPY ./ ./ - RUN go mod download - RUN go mod verify - RUN go mod vendor - CMD ["false"] - test: - template: | - FROM {{ .Repository }}:base AS {{ .Docker.CurrentStage }} - WORKDIR /src/github.com/autonomy/talos/src/initramfs - RUN chmod +x ./hack/test.sh - ENV PATH /rootfs/bin:$PATH - RUN ./hack/test.sh --unit - RUN ./hack/test.sh --lint ./hack/golangci-lint.yaml - trustd: - template: | - FROM {{ .Repository }}:base AS {{ .Docker.CurrentStage }} - WORKDIR /src/github.com/autonomy/talos/src/initramfs/cmd/{{ .Docker.CurrentStage }} - {{ if and .Git.IsClean .Git.IsTag }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Trustd -X {{ index .Variables "versionPath" }}.Tag={{ .Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X \"{{ index .Variables "versionPath" }}.Built={{ .Built }}\"" \ - -o /{{ .Docker.CurrentStage }} - {{ else }} - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Trustd -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ - -o /{{ .Docker.CurrentStage }} - {{ end }} - RUN chmod +x /{{ .Docker.CurrentStage }} - FROM scratch - COPY --from={{ .Docker.CurrentStage }} /{{ .Docker.CurrentStage }} /{{ .Docker.CurrentStage }} - ENTRYPOINT ["/{{ .Docker.CurrentStage }}"] - xfsprogs: - template: | - FROM autonomy/toolchain:690a03a AS {{ .Docker.CurrentStage }} - RUN mkdir -p /etc/ssl/certs - RUN ln -s /toolchain/etc/ssl/certs/ca-certificates /etc/ssl/certs/ca-certificates - # RUN mkdir /lib \ - # && cp /toolchain/lib/libblkid.* /lib \ - # && cp /toolchain/lib/libuuid.* /lib - WORKDIR /tmp/{{ .Docker.CurrentStage }} - RUN curl -L {{index .Variables "srcXfsprogs" }} | tar -xJ --strip-components=1 - RUN make \ - DEBUG=-DNDEBUG \ - INSTALL_USER=0 \ - INSTALL_GROUP=0 \ - LOCAL_CONFIGURE_OPTIONS="--prefix=/" - RUN make install DESTDIR={{ index .Variables "rootfs" }} diff --git a/src/initramfs/cmd/blockd/proto/api.pb.go b/src/initramfs/cmd/blockd/proto/api.pb.go deleted file mode 100644 index c2e390b1a..000000000 --- a/src/initramfs/cmd/blockd/proto/api.pb.go +++ /dev/null @@ -1,165 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: api.proto - -package proto - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import empty "github.com/golang/protobuf/ptypes/empty" - -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package - -// The request message containing the process name. -type ResizePartitionRequest struct { - Number int32 `protobuf:"varint,1,opt,name=number,proto3" json:"number,omitempty"` - Size int64 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ResizePartitionRequest) Reset() { *m = ResizePartitionRequest{} } -func (m *ResizePartitionRequest) String() string { return proto.CompactTextString(m) } -func (*ResizePartitionRequest) ProtoMessage() {} -func (*ResizePartitionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_45c2a43533cf9ef2, []int{0} -} -func (m *ResizePartitionRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ResizePartitionRequest.Unmarshal(m, b) -} -func (m *ResizePartitionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ResizePartitionRequest.Marshal(b, m, deterministic) -} -func (dst *ResizePartitionRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResizePartitionRequest.Merge(dst, src) -} -func (m *ResizePartitionRequest) XXX_Size() int { - return xxx_messageInfo_ResizePartitionRequest.Size(m) -} -func (m *ResizePartitionRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ResizePartitionRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ResizePartitionRequest proto.InternalMessageInfo - -func (m *ResizePartitionRequest) GetNumber() int32 { - if m != nil { - return m.Number - } - return 0 -} - -func (m *ResizePartitionRequest) GetSize() int64 { - if m != nil { - return m.Size - } - return 0 -} - -func init() { - proto.RegisterType((*ResizePartitionRequest)(nil), "proto.ResizePartitionRequest") -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 - -// BlockdClient is the client API for Blockd service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type BlockdClient interface { - Resize(ctx context.Context, in *ResizePartitionRequest, opts ...grpc.CallOption) (*empty.Empty, error) -} - -type blockdClient struct { - cc *grpc.ClientConn -} - -func NewBlockdClient(cc *grpc.ClientConn) BlockdClient { - return &blockdClient{cc} -} - -func (c *blockdClient) Resize(ctx context.Context, in *ResizePartitionRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) - err := c.cc.Invoke(ctx, "/proto.Blockd/Resize", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// BlockdServer is the server API for Blockd service. -type BlockdServer interface { - Resize(context.Context, *ResizePartitionRequest) (*empty.Empty, error) -} - -func RegisterBlockdServer(s *grpc.Server, srv BlockdServer) { - s.RegisterService(&_Blockd_serviceDesc, srv) -} - -func _Blockd_Resize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ResizePartitionRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(BlockdServer).Resize(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.Blockd/Resize", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BlockdServer).Resize(ctx, req.(*ResizePartitionRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _Blockd_serviceDesc = grpc.ServiceDesc{ - ServiceName: "proto.Blockd", - HandlerType: (*BlockdServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Resize", - Handler: _Blockd_Resize_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "api.proto", -} - -func init() { proto.RegisterFile("api.proto", fileDescriptor_api_45c2a43533cf9ef2) } - -var fileDescriptor_api_45c2a43533cf9ef2 = []byte{ - // 163 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4c, 0x2c, 0xc8, 0xd4, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x53, 0x52, 0xd2, 0xe9, 0xf9, 0xf9, 0xe9, 0x39, - 0xa9, 0xfa, 0x60, 0x5e, 0x52, 0x69, 0x9a, 0x7e, 0x6a, 0x6e, 0x41, 0x49, 0x25, 0x44, 0x8d, 0x92, - 0x0b, 0x97, 0x58, 0x50, 0x6a, 0x71, 0x66, 0x55, 0x6a, 0x40, 0x62, 0x51, 0x49, 0x66, 0x49, 0x66, - 0x7e, 0x5e, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x90, 0x18, 0x17, 0x5b, 0x5e, 0x69, 0x6e, - 0x52, 0x6a, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0x94, 0x27, 0x24, 0xc4, 0xc5, 0x02, - 0x52, 0x2f, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x1c, 0x04, 0x66, 0x1b, 0x79, 0x73, 0xb1, 0x39, 0xe5, - 0xe4, 0x27, 0x67, 0xa7, 0x08, 0x39, 0x72, 0xb1, 0x41, 0xcc, 0x13, 0x92, 0x85, 0xd8, 0xa0, 0x87, - 0xdd, 0x78, 0x29, 0x31, 0x3d, 0x88, 0xb3, 0xf4, 0x60, 0xce, 0xd2, 0x73, 0x05, 0x39, 0x4b, 0x89, - 0x21, 0x89, 0x0d, 0x2c, 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xfc, 0x26, 0x27, 0xca, - 0x00, 0x00, 0x00, -} diff --git a/src/initramfs/cmd/osctl/main.go b/src/initramfs/cmd/osctl/main.go deleted file mode 100644 index b934d404e..000000000 --- a/src/initramfs/cmd/osctl/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "github.com/autonomy/talos/src/initramfs/cmd/osctl/cmd" - -func main() { - cmd.Execute() -} diff --git a/src/initramfs/cmd/osd/proto/api.pb.go b/src/initramfs/cmd/osd/proto/api.pb.go deleted file mode 100644 index 469c1acb6..000000000 --- a/src/initramfs/cmd/osd/proto/api.pb.go +++ /dev/null @@ -1,736 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: api.proto - -package proto - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import empty "github.com/golang/protobuf/ptypes/empty" - -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package - -// The response message containing the requested processes. -type ProcessesReply struct { - Processes []*Process `protobuf:"bytes,1,rep,name=processes,proto3" json:"processes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ProcessesReply) Reset() { *m = ProcessesReply{} } -func (m *ProcessesReply) String() string { return proto.CompactTextString(m) } -func (*ProcessesReply) ProtoMessage() {} -func (*ProcessesReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_a4ce81dae7624600, []int{0} -} -func (m *ProcessesReply) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ProcessesReply.Unmarshal(m, b) -} -func (m *ProcessesReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ProcessesReply.Marshal(b, m, deterministic) -} -func (dst *ProcessesReply) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProcessesReply.Merge(dst, src) -} -func (m *ProcessesReply) XXX_Size() int { - return xxx_messageInfo_ProcessesReply.Size(m) -} -func (m *ProcessesReply) XXX_DiscardUnknown() { - xxx_messageInfo_ProcessesReply.DiscardUnknown(m) -} - -var xxx_messageInfo_ProcessesReply proto.InternalMessageInfo - -func (m *ProcessesReply) GetProcesses() []*Process { - if m != nil { - return m.Processes - } - return nil -} - -// The response message containing the requested processes. -type Process struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Image string `protobuf:"bytes,2,opt,name=image,proto3" json:"image,omitempty"` - Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` - MemoryUsage uint64 `protobuf:"varint,4,opt,name=memory_usage,json=memoryUsage,proto3" json:"memory_usage,omitempty"` - CpuUsage uint64 `protobuf:"varint,5,opt,name=cpu_usage,json=cpuUsage,proto3" json:"cpu_usage,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Process) Reset() { *m = Process{} } -func (m *Process) String() string { return proto.CompactTextString(m) } -func (*Process) ProtoMessage() {} -func (*Process) Descriptor() ([]byte, []int) { - return fileDescriptor_api_a4ce81dae7624600, []int{1} -} -func (m *Process) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Process.Unmarshal(m, b) -} -func (m *Process) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Process.Marshal(b, m, deterministic) -} -func (dst *Process) XXX_Merge(src proto.Message) { - xxx_messageInfo_Process.Merge(dst, src) -} -func (m *Process) XXX_Size() int { - return xxx_messageInfo_Process.Size(m) -} -func (m *Process) XXX_DiscardUnknown() { - xxx_messageInfo_Process.DiscardUnknown(m) -} - -var xxx_messageInfo_Process proto.InternalMessageInfo - -func (m *Process) GetId() string { - if m != nil { - return m.Id - } - return "" -} - -func (m *Process) GetImage() string { - if m != nil { - return m.Image - } - return "" -} - -func (m *Process) GetStatus() string { - if m != nil { - return m.Status - } - return "" -} - -func (m *Process) GetMemoryUsage() uint64 { - if m != nil { - return m.MemoryUsage - } - return 0 -} - -func (m *Process) GetCpuUsage() uint64 { - if m != nil { - return m.CpuUsage - } - return 0 -} - -// The request message containing the process to restart. -type RestartRequest struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Timeout int32 `protobuf:"varint,2,opt,name=timeout,proto3" json:"timeout,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *RestartRequest) Reset() { *m = RestartRequest{} } -func (m *RestartRequest) String() string { return proto.CompactTextString(m) } -func (*RestartRequest) ProtoMessage() {} -func (*RestartRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_a4ce81dae7624600, []int{2} -} -func (m *RestartRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RestartRequest.Unmarshal(m, b) -} -func (m *RestartRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RestartRequest.Marshal(b, m, deterministic) -} -func (dst *RestartRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RestartRequest.Merge(dst, src) -} -func (m *RestartRequest) XXX_Size() int { - return xxx_messageInfo_RestartRequest.Size(m) -} -func (m *RestartRequest) XXX_DiscardUnknown() { - xxx_messageInfo_RestartRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_RestartRequest proto.InternalMessageInfo - -func (m *RestartRequest) GetId() string { - if m != nil { - return m.Id - } - return "" -} - -func (m *RestartRequest) GetTimeout() int32 { - if m != nil { - return m.Timeout - } - return 0 -} - -// The response message containing the restart status. -type RestartReply struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *RestartReply) Reset() { *m = RestartReply{} } -func (m *RestartReply) String() string { return proto.CompactTextString(m) } -func (*RestartReply) ProtoMessage() {} -func (*RestartReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_a4ce81dae7624600, []int{3} -} -func (m *RestartReply) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RestartReply.Unmarshal(m, b) -} -func (m *RestartReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RestartReply.Marshal(b, m, deterministic) -} -func (dst *RestartReply) XXX_Merge(src proto.Message) { - xxx_messageInfo_RestartReply.Merge(dst, src) -} -func (m *RestartReply) XXX_Size() int { - return xxx_messageInfo_RestartReply.Size(m) -} -func (m *RestartReply) XXX_DiscardUnknown() { - xxx_messageInfo_RestartReply.DiscardUnknown(m) -} - -var xxx_messageInfo_RestartReply proto.InternalMessageInfo - -// The response message containing the restart status. -type ResetReply struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ResetReply) Reset() { *m = ResetReply{} } -func (m *ResetReply) String() string { return proto.CompactTextString(m) } -func (*ResetReply) ProtoMessage() {} -func (*ResetReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_a4ce81dae7624600, []int{4} -} -func (m *ResetReply) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ResetReply.Unmarshal(m, b) -} -func (m *ResetReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ResetReply.Marshal(b, m, deterministic) -} -func (dst *ResetReply) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResetReply.Merge(dst, src) -} -func (m *ResetReply) XXX_Size() int { - return xxx_messageInfo_ResetReply.Size(m) -} -func (m *ResetReply) XXX_DiscardUnknown() { - xxx_messageInfo_ResetReply.DiscardUnknown(m) -} - -var xxx_messageInfo_ResetReply proto.InternalMessageInfo - -// The response message containing the restart status. -type RebootReply struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *RebootReply) Reset() { *m = RebootReply{} } -func (m *RebootReply) String() string { return proto.CompactTextString(m) } -func (*RebootReply) ProtoMessage() {} -func (*RebootReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_a4ce81dae7624600, []int{5} -} -func (m *RebootReply) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RebootReply.Unmarshal(m, b) -} -func (m *RebootReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RebootReply.Marshal(b, m, deterministic) -} -func (dst *RebootReply) XXX_Merge(src proto.Message) { - xxx_messageInfo_RebootReply.Merge(dst, src) -} -func (m *RebootReply) XXX_Size() int { - return xxx_messageInfo_RebootReply.Size(m) -} -func (m *RebootReply) XXX_DiscardUnknown() { - xxx_messageInfo_RebootReply.DiscardUnknown(m) -} - -var xxx_messageInfo_RebootReply proto.InternalMessageInfo - -// The request message containing the process name. -type LogsRequest struct { - Process string `protobuf:"bytes,1,opt,name=process,proto3" json:"process,omitempty"` - Container bool `protobuf:"varint,2,opt,name=container,proto3" json:"container,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *LogsRequest) Reset() { *m = LogsRequest{} } -func (m *LogsRequest) String() string { return proto.CompactTextString(m) } -func (*LogsRequest) ProtoMessage() {} -func (*LogsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_a4ce81dae7624600, []int{6} -} -func (m *LogsRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_LogsRequest.Unmarshal(m, b) -} -func (m *LogsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_LogsRequest.Marshal(b, m, deterministic) -} -func (dst *LogsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_LogsRequest.Merge(dst, src) -} -func (m *LogsRequest) XXX_Size() int { - return xxx_messageInfo_LogsRequest.Size(m) -} -func (m *LogsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_LogsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_LogsRequest proto.InternalMessageInfo - -func (m *LogsRequest) GetProcess() string { - if m != nil { - return m.Process - } - return "" -} - -func (m *LogsRequest) GetContainer() bool { - if m != nil { - return m.Container - } - return false -} - -// The response message containing the requested logs. -type Data struct { - Bytes []byte `protobuf:"bytes,1,opt,name=bytes,proto3" json:"bytes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Data) Reset() { *m = Data{} } -func (m *Data) String() string { return proto.CompactTextString(m) } -func (*Data) ProtoMessage() {} -func (*Data) Descriptor() ([]byte, []int) { - return fileDescriptor_api_a4ce81dae7624600, []int{7} -} -func (m *Data) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Data.Unmarshal(m, b) -} -func (m *Data) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Data.Marshal(b, m, deterministic) -} -func (dst *Data) XXX_Merge(src proto.Message) { - xxx_messageInfo_Data.Merge(dst, src) -} -func (m *Data) XXX_Size() int { - return xxx_messageInfo_Data.Size(m) -} -func (m *Data) XXX_DiscardUnknown() { - xxx_messageInfo_Data.DiscardUnknown(m) -} - -var xxx_messageInfo_Data proto.InternalMessageInfo - -func (m *Data) GetBytes() []byte { - if m != nil { - return m.Bytes - } - return nil -} - -func init() { - proto.RegisterType((*ProcessesReply)(nil), "proto.ProcessesReply") - proto.RegisterType((*Process)(nil), "proto.Process") - proto.RegisterType((*RestartRequest)(nil), "proto.RestartRequest") - proto.RegisterType((*RestartReply)(nil), "proto.RestartReply") - proto.RegisterType((*ResetReply)(nil), "proto.ResetReply") - proto.RegisterType((*RebootReply)(nil), "proto.RebootReply") - proto.RegisterType((*LogsRequest)(nil), "proto.LogsRequest") - proto.RegisterType((*Data)(nil), "proto.Data") -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 - -// OSDClient is the client API for OSD service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type OSDClient interface { - Kubeconfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) - Processes(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ProcessesReply, error) - Restart(ctx context.Context, in *RestartRequest, opts ...grpc.CallOption) (*RestartReply, error) - Reset(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ResetReply, error) - Reboot(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*RebootReply, error) - Logs(ctx context.Context, in *LogsRequest, opts ...grpc.CallOption) (OSD_LogsClient, error) - Dmesg(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) - Version(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) -} - -type oSDClient struct { - cc *grpc.ClientConn -} - -func NewOSDClient(cc *grpc.ClientConn) OSDClient { - return &oSDClient{cc} -} - -func (c *oSDClient) Kubeconfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) { - out := new(Data) - err := c.cc.Invoke(ctx, "/proto.OSD/Kubeconfig", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *oSDClient) Processes(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ProcessesReply, error) { - out := new(ProcessesReply) - err := c.cc.Invoke(ctx, "/proto.OSD/Processes", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *oSDClient) Restart(ctx context.Context, in *RestartRequest, opts ...grpc.CallOption) (*RestartReply, error) { - out := new(RestartReply) - err := c.cc.Invoke(ctx, "/proto.OSD/Restart", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *oSDClient) Reset(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ResetReply, error) { - out := new(ResetReply) - err := c.cc.Invoke(ctx, "/proto.OSD/Reset", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *oSDClient) Reboot(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*RebootReply, error) { - out := new(RebootReply) - err := c.cc.Invoke(ctx, "/proto.OSD/Reboot", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *oSDClient) Logs(ctx context.Context, in *LogsRequest, opts ...grpc.CallOption) (OSD_LogsClient, error) { - stream, err := c.cc.NewStream(ctx, &_OSD_serviceDesc.Streams[0], "/proto.OSD/Logs", opts...) - if err != nil { - return nil, err - } - x := &oSDLogsClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type OSD_LogsClient interface { - Recv() (*Data, error) - grpc.ClientStream -} - -type oSDLogsClient struct { - grpc.ClientStream -} - -func (x *oSDLogsClient) Recv() (*Data, error) { - m := new(Data) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *oSDClient) Dmesg(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) { - out := new(Data) - err := c.cc.Invoke(ctx, "/proto.OSD/Dmesg", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *oSDClient) Version(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) { - out := new(Data) - err := c.cc.Invoke(ctx, "/proto.OSD/Version", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// OSDServer is the server API for OSD service. -type OSDServer interface { - Kubeconfig(context.Context, *empty.Empty) (*Data, error) - Processes(context.Context, *empty.Empty) (*ProcessesReply, error) - Restart(context.Context, *RestartRequest) (*RestartReply, error) - Reset(context.Context, *empty.Empty) (*ResetReply, error) - Reboot(context.Context, *empty.Empty) (*RebootReply, error) - Logs(*LogsRequest, OSD_LogsServer) error - Dmesg(context.Context, *empty.Empty) (*Data, error) - Version(context.Context, *empty.Empty) (*Data, error) -} - -func RegisterOSDServer(s *grpc.Server, srv OSDServer) { - s.RegisterService(&_OSD_serviceDesc, srv) -} - -func _OSD_Kubeconfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OSDServer).Kubeconfig(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.OSD/Kubeconfig", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OSDServer).Kubeconfig(ctx, req.(*empty.Empty)) - } - return interceptor(ctx, in, info, handler) -} - -func _OSD_Processes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OSDServer).Processes(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.OSD/Processes", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OSDServer).Processes(ctx, req.(*empty.Empty)) - } - return interceptor(ctx, in, info, handler) -} - -func _OSD_Restart_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(RestartRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OSDServer).Restart(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.OSD/Restart", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OSDServer).Restart(ctx, req.(*RestartRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _OSD_Reset_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OSDServer).Reset(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.OSD/Reset", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OSDServer).Reset(ctx, req.(*empty.Empty)) - } - return interceptor(ctx, in, info, handler) -} - -func _OSD_Reboot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OSDServer).Reboot(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.OSD/Reboot", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OSDServer).Reboot(ctx, req.(*empty.Empty)) - } - return interceptor(ctx, in, info, handler) -} - -func _OSD_Logs_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(LogsRequest) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(OSDServer).Logs(m, &oSDLogsServer{stream}) -} - -type OSD_LogsServer interface { - Send(*Data) error - grpc.ServerStream -} - -type oSDLogsServer struct { - grpc.ServerStream -} - -func (x *oSDLogsServer) Send(m *Data) error { - return x.ServerStream.SendMsg(m) -} - -func _OSD_Dmesg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OSDServer).Dmesg(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.OSD/Dmesg", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OSDServer).Dmesg(ctx, req.(*empty.Empty)) - } - return interceptor(ctx, in, info, handler) -} - -func _OSD_Version_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OSDServer).Version(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.OSD/Version", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OSDServer).Version(ctx, req.(*empty.Empty)) - } - return interceptor(ctx, in, info, handler) -} - -var _OSD_serviceDesc = grpc.ServiceDesc{ - ServiceName: "proto.OSD", - HandlerType: (*OSDServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Kubeconfig", - Handler: _OSD_Kubeconfig_Handler, - }, - { - MethodName: "Processes", - Handler: _OSD_Processes_Handler, - }, - { - MethodName: "Restart", - Handler: _OSD_Restart_Handler, - }, - { - MethodName: "Reset", - Handler: _OSD_Reset_Handler, - }, - { - MethodName: "Reboot", - Handler: _OSD_Reboot_Handler, - }, - { - MethodName: "Dmesg", - Handler: _OSD_Dmesg_Handler, - }, - { - MethodName: "Version", - Handler: _OSD_Version_Handler, - }, - }, - Streams: []grpc.StreamDesc{ - { - StreamName: "Logs", - Handler: _OSD_Logs_Handler, - ServerStreams: true, - }, - }, - Metadata: "api.proto", -} - -func init() { proto.RegisterFile("api.proto", fileDescriptor_api_a4ce81dae7624600) } - -var fileDescriptor_api_a4ce81dae7624600 = []byte{ - // 431 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x51, 0x6b, 0xd4, 0x40, - 0x14, 0x85, 0x37, 0xbb, 0x9b, 0x4d, 0x73, 0xb3, 0x06, 0xbc, 0x6a, 0x09, 0xdb, 0x3e, 0xac, 0x79, - 0x5a, 0x50, 0xd2, 0xd2, 0x8a, 0x82, 0x88, 0x4f, 0xdb, 0x27, 0x05, 0x65, 0x44, 0x5f, 0x25, 0x49, - 0x6f, 0x43, 0x60, 0xb3, 0x33, 0x66, 0x66, 0x1e, 0xf2, 0x0b, 0xfc, 0x37, 0xfe, 0x46, 0xc9, 0xcc, - 0x64, 0x63, 0x2b, 0x0b, 0x7d, 0x0a, 0xe7, 0xdc, 0x7b, 0x72, 0x87, 0xf3, 0x41, 0x98, 0x8b, 0x3a, - 0x13, 0x2d, 0x57, 0x1c, 0x7d, 0xf3, 0x59, 0x9d, 0x55, 0x9c, 0x57, 0x3b, 0xba, 0x30, 0xaa, 0xd0, - 0x77, 0x17, 0xd4, 0x08, 0xd5, 0xd9, 0x9d, 0xf4, 0x23, 0xc4, 0x5f, 0x5b, 0x5e, 0x92, 0x94, 0x24, - 0x19, 0x89, 0x5d, 0x87, 0xaf, 0x21, 0x14, 0x83, 0x93, 0x78, 0xeb, 0xd9, 0x26, 0xba, 0x8a, 0xed, - 0x72, 0xe6, 0x36, 0xd9, 0xb8, 0x90, 0xfe, 0xf6, 0x20, 0x70, 0x36, 0xc6, 0x30, 0xad, 0x6f, 0x13, - 0x6f, 0xed, 0x6d, 0x42, 0x36, 0xad, 0x6f, 0xf1, 0x39, 0xf8, 0x75, 0x93, 0x57, 0x94, 0x4c, 0x8d, - 0x65, 0x05, 0x9e, 0xc2, 0x42, 0xaa, 0x5c, 0x69, 0x99, 0xcc, 0x8c, 0xed, 0x14, 0xbe, 0x84, 0x65, - 0x43, 0x0d, 0x6f, 0xbb, 0x9f, 0x5a, 0xf6, 0xa1, 0xf9, 0xda, 0xdb, 0xcc, 0x59, 0x64, 0xbd, 0xef, - 0xbd, 0x85, 0x67, 0x10, 0x96, 0x42, 0xbb, 0xb9, 0x6f, 0xe6, 0x27, 0xa5, 0xd0, 0x66, 0x98, 0xbe, - 0x87, 0x98, 0x91, 0x54, 0x79, 0xab, 0x18, 0xfd, 0xd2, 0x24, 0xd5, 0x7f, 0xef, 0x49, 0x20, 0x50, - 0x75, 0x43, 0x5c, 0x2b, 0xf3, 0x22, 0x9f, 0x0d, 0x32, 0x8d, 0x61, 0x79, 0xc8, 0x8a, 0x5d, 0x97, - 0x2e, 0x01, 0x18, 0x49, 0x72, 0xea, 0x09, 0x44, 0x8c, 0x0a, 0xce, 0x9d, 0xbc, 0x81, 0xe8, 0x33, - 0xaf, 0xe4, 0x70, 0x25, 0x81, 0xc0, 0xd5, 0xe1, 0x4e, 0x0d, 0x12, 0xcf, 0x21, 0x2c, 0xf9, 0x5e, - 0xe5, 0xf5, 0x9e, 0x5a, 0x73, 0xf1, 0x84, 0x8d, 0x46, 0x7a, 0x0e, 0xf3, 0x6d, 0xae, 0xf2, 0xbe, - 0xa5, 0xa2, 0x53, 0x64, 0xd3, 0x4b, 0x66, 0xc5, 0xd5, 0x9f, 0x19, 0xcc, 0xbe, 0x7c, 0xdb, 0xe2, - 0x35, 0xc0, 0x27, 0x5d, 0x50, 0xc9, 0xf7, 0x77, 0x75, 0x85, 0xa7, 0x99, 0x65, 0x99, 0x0d, 0x2c, - 0xb3, 0x9b, 0x9e, 0xe5, 0x2a, 0x72, 0x80, 0xfa, 0x1f, 0xa6, 0x13, 0xfc, 0x00, 0xe1, 0x01, 0xea, - 0xd1, 0xcc, 0x8b, 0xfb, 0x50, 0x1d, 0xfe, 0x74, 0x82, 0xef, 0x20, 0x70, 0x65, 0xe0, 0xb0, 0x73, - 0xbf, 0xd8, 0xd5, 0xb3, 0x87, 0xb6, 0x0d, 0xbe, 0x01, 0xdf, 0xb4, 0x76, 0xf4, 0xe4, 0xd3, 0x31, - 0x47, 0x87, 0xd4, 0x5b, 0x58, 0xd8, 0x76, 0x8f, 0xc6, 0xf0, 0x10, 0x1b, 0x21, 0x4c, 0xf0, 0x15, - 0xcc, 0x7b, 0x0c, 0x38, 0x4c, 0xff, 0x61, 0xf2, 0xa0, 0x8f, 0x4b, 0x0f, 0x33, 0xf0, 0xb7, 0x0d, - 0xc9, 0x47, 0x37, 0x78, 0x09, 0xc1, 0x0f, 0x6a, 0x65, 0xcd, 0xf7, 0x8f, 0x4c, 0x14, 0x0b, 0xa3, - 0xae, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x72, 0xae, 0x8f, 0x7e, 0x80, 0x03, 0x00, 0x00, -} diff --git a/src/initramfs/cmd/trustd/proto/api.pb.go b/src/initramfs/cmd/trustd/proto/api.pb.go deleted file mode 100644 index 666cb1bad..000000000 --- a/src/initramfs/cmd/trustd/proto/api.pb.go +++ /dev/null @@ -1,320 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: api.proto - -package proto - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package - -// The request message containing the process name. -type CertificateRequest struct { - Csr []byte `protobuf:"bytes,1,opt,name=csr,proto3" json:"csr,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CertificateRequest) Reset() { *m = CertificateRequest{} } -func (m *CertificateRequest) String() string { return proto.CompactTextString(m) } -func (*CertificateRequest) ProtoMessage() {} -func (*CertificateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_6d48f67e45b68bdd, []int{0} -} -func (m *CertificateRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CertificateRequest.Unmarshal(m, b) -} -func (m *CertificateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CertificateRequest.Marshal(b, m, deterministic) -} -func (dst *CertificateRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CertificateRequest.Merge(dst, src) -} -func (m *CertificateRequest) XXX_Size() int { - return xxx_messageInfo_CertificateRequest.Size(m) -} -func (m *CertificateRequest) XXX_DiscardUnknown() { - xxx_messageInfo_CertificateRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_CertificateRequest proto.InternalMessageInfo - -func (m *CertificateRequest) GetCsr() []byte { - if m != nil { - return m.Csr - } - return nil -} - -// The response message containing the requested logs. -type CertificateResponse struct { - Bytes []byte `protobuf:"bytes,1,opt,name=bytes,proto3" json:"bytes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CertificateResponse) Reset() { *m = CertificateResponse{} } -func (m *CertificateResponse) String() string { return proto.CompactTextString(m) } -func (*CertificateResponse) ProtoMessage() {} -func (*CertificateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_api_6d48f67e45b68bdd, []int{1} -} -func (m *CertificateResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CertificateResponse.Unmarshal(m, b) -} -func (m *CertificateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CertificateResponse.Marshal(b, m, deterministic) -} -func (dst *CertificateResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_CertificateResponse.Merge(dst, src) -} -func (m *CertificateResponse) XXX_Size() int { - return xxx_messageInfo_CertificateResponse.Size(m) -} -func (m *CertificateResponse) XXX_DiscardUnknown() { - xxx_messageInfo_CertificateResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_CertificateResponse proto.InternalMessageInfo - -func (m *CertificateResponse) GetBytes() []byte { - if m != nil { - return m.Bytes - } - return nil -} - -// The request message containing the process name. -type WriteFileRequest struct { - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - Perm int32 `protobuf:"varint,3,opt,name=perm,proto3" json:"perm,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *WriteFileRequest) Reset() { *m = WriteFileRequest{} } -func (m *WriteFileRequest) String() string { return proto.CompactTextString(m) } -func (*WriteFileRequest) ProtoMessage() {} -func (*WriteFileRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_6d48f67e45b68bdd, []int{2} -} -func (m *WriteFileRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_WriteFileRequest.Unmarshal(m, b) -} -func (m *WriteFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_WriteFileRequest.Marshal(b, m, deterministic) -} -func (dst *WriteFileRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_WriteFileRequest.Merge(dst, src) -} -func (m *WriteFileRequest) XXX_Size() int { - return xxx_messageInfo_WriteFileRequest.Size(m) -} -func (m *WriteFileRequest) XXX_DiscardUnknown() { - xxx_messageInfo_WriteFileRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_WriteFileRequest proto.InternalMessageInfo - -func (m *WriteFileRequest) GetPath() string { - if m != nil { - return m.Path - } - return "" -} - -func (m *WriteFileRequest) GetData() []byte { - if m != nil { - return m.Data - } - return nil -} - -func (m *WriteFileRequest) GetPerm() int32 { - if m != nil { - return m.Perm - } - return 0 -} - -// The response message containing the requested logs. -type WriteFileResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *WriteFileResponse) Reset() { *m = WriteFileResponse{} } -func (m *WriteFileResponse) String() string { return proto.CompactTextString(m) } -func (*WriteFileResponse) ProtoMessage() {} -func (*WriteFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_api_6d48f67e45b68bdd, []int{3} -} -func (m *WriteFileResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_WriteFileResponse.Unmarshal(m, b) -} -func (m *WriteFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_WriteFileResponse.Marshal(b, m, deterministic) -} -func (dst *WriteFileResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_WriteFileResponse.Merge(dst, src) -} -func (m *WriteFileResponse) XXX_Size() int { - return xxx_messageInfo_WriteFileResponse.Size(m) -} -func (m *WriteFileResponse) XXX_DiscardUnknown() { - xxx_messageInfo_WriteFileResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_WriteFileResponse proto.InternalMessageInfo - -func init() { - proto.RegisterType((*CertificateRequest)(nil), "proto.CertificateRequest") - proto.RegisterType((*CertificateResponse)(nil), "proto.CertificateResponse") - proto.RegisterType((*WriteFileRequest)(nil), "proto.WriteFileRequest") - proto.RegisterType((*WriteFileResponse)(nil), "proto.WriteFileResponse") -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 - -// TrustdClient is the client API for Trustd service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type TrustdClient interface { - Certificate(ctx context.Context, in *CertificateRequest, opts ...grpc.CallOption) (*CertificateResponse, error) - WriteFile(ctx context.Context, in *WriteFileRequest, opts ...grpc.CallOption) (*WriteFileResponse, error) -} - -type trustdClient struct { - cc *grpc.ClientConn -} - -func NewTrustdClient(cc *grpc.ClientConn) TrustdClient { - return &trustdClient{cc} -} - -func (c *trustdClient) Certificate(ctx context.Context, in *CertificateRequest, opts ...grpc.CallOption) (*CertificateResponse, error) { - out := new(CertificateResponse) - err := c.cc.Invoke(ctx, "/proto.Trustd/Certificate", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *trustdClient) WriteFile(ctx context.Context, in *WriteFileRequest, opts ...grpc.CallOption) (*WriteFileResponse, error) { - out := new(WriteFileResponse) - err := c.cc.Invoke(ctx, "/proto.Trustd/WriteFile", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// TrustdServer is the server API for Trustd service. -type TrustdServer interface { - Certificate(context.Context, *CertificateRequest) (*CertificateResponse, error) - WriteFile(context.Context, *WriteFileRequest) (*WriteFileResponse, error) -} - -func RegisterTrustdServer(s *grpc.Server, srv TrustdServer) { - s.RegisterService(&_Trustd_serviceDesc, srv) -} - -func _Trustd_Certificate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CertificateRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TrustdServer).Certificate(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.Trustd/Certificate", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TrustdServer).Certificate(ctx, req.(*CertificateRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Trustd_WriteFile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(WriteFileRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TrustdServer).WriteFile(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.Trustd/WriteFile", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TrustdServer).WriteFile(ctx, req.(*WriteFileRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _Trustd_serviceDesc = grpc.ServiceDesc{ - ServiceName: "proto.Trustd", - HandlerType: (*TrustdServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Certificate", - Handler: _Trustd_Certificate_Handler, - }, - { - MethodName: "WriteFile", - Handler: _Trustd_WriteFile_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "api.proto", -} - -func init() { proto.RegisterFile("api.proto", fileDescriptor_api_6d48f67e45b68bdd) } - -var fileDescriptor_api_6d48f67e45b68bdd = []byte{ - // 219 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4c, 0x2c, 0xc8, 0xd4, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x53, 0x4a, 0x6a, 0x5c, 0x42, 0xce, 0xa9, 0x45, - 0x25, 0x99, 0x69, 0x99, 0xc9, 0x89, 0x25, 0xa9, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5, 0x25, 0x42, - 0x02, 0x5c, 0xcc, 0xc9, 0xc5, 0x45, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x20, 0xa6, 0x92, - 0x36, 0x97, 0x30, 0x8a, 0xba, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x11, 0x2e, 0xd6, 0xa4, - 0xca, 0x92, 0xd4, 0x62, 0xa8, 0x52, 0x08, 0x47, 0xc9, 0x8f, 0x4b, 0x20, 0xbc, 0x28, 0xb3, 0x24, - 0xd5, 0x2d, 0x33, 0x07, 0x6e, 0xa4, 0x10, 0x17, 0x4b, 0x41, 0x62, 0x49, 0x06, 0x58, 0x21, 0x67, - 0x10, 0x98, 0x0d, 0x12, 0x4b, 0x49, 0x2c, 0x49, 0x94, 0x60, 0x02, 0x6b, 0x06, 0xb3, 0xc1, 0xea, - 0x52, 0x8b, 0x72, 0x25, 0x98, 0x15, 0x18, 0x35, 0x58, 0x83, 0xc0, 0x6c, 0x25, 0x61, 0x2e, 0x41, - 0x24, 0xf3, 0x20, 0x56, 0x1b, 0x4d, 0x62, 0xe4, 0x62, 0x0b, 0x29, 0x2a, 0x2d, 0x2e, 0x49, 0x11, - 0x72, 0xe3, 0xe2, 0x46, 0x72, 0x9c, 0x90, 0x24, 0xc4, 0x8b, 0x7a, 0x98, 0x1e, 0x93, 0x92, 0xc2, - 0x26, 0x05, 0x31, 0x50, 0x89, 0x41, 0xc8, 0x81, 0x8b, 0x13, 0x6e, 0x8f, 0x90, 0x38, 0x54, 0x29, - 0xba, 0x4f, 0xa4, 0x24, 0x30, 0x25, 0x60, 0x26, 0x24, 0xb1, 0x81, 0xa5, 0x8c, 0x01, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x80, 0xe5, 0x5e, 0xbe, 0x69, 0x01, 0x00, 0x00, -} diff --git a/src/initramfs/hack/golangci-lint.yaml b/src/initramfs/hack/golangci-lint.yaml deleted file mode 100644 index 71945d7b3..000000000 --- a/src/initramfs/hack/golangci-lint.yaml +++ /dev/null @@ -1,132 +0,0 @@ -# This file contains all available configuration options -# with their default values. - -# options for analysis running -run: - # default concurrency is a available CPU number - # concurrency: 4 - - # timeout for analysis, e.g. 30s, 5m, default is 1m - deadline: 10m - - # exit code when at least one issue was found, default is 1 - issues-exit-code: 1 - - # include test files or not, default is true - tests: true - -# output configuration options -output: - # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number" - format: line-number - -# all available settings of specific linters -linters-settings: - errcheck: - # report about not checking of errors in type assetions: `a := b.(MyStruct)`; - # default is false: such cases aren't reported by default. - check-type-assertions: true - - # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`; - # default is false: such cases aren't reported by default. - check-blank: true - govet: - # report about shadowed variables - check-shadowing: true - golint: - # minimal confidence for issues, default is 0.8 - min-confidence: 0.8 - gofmt: - # simplify code: gofmt with `-s` option, true by default - simplify: true - gocyclo: - # minimal code complexity to report, 30 by default (but we recommend 10-20) - min-complexity: 10 - maligned: - # print struct with more effective memory layout or not, false by default - suggest-new: true - dupl: - # tokens count to trigger issue, 150 by default - threshold: 100 - goconst: - # minimal length of string constant, 3 by default - min-len: 3 - # minimal occurrences count to trigger, 3 by default - min-occurrences: 3 - depguard: {} - misspell: - # Correct spellings using locale preferences for US or UK. - # Default is to use a neutral variety of English. - # Setting locale to US will correct the British spelling of 'colour' to 'color'. - locale: US - lll: - # max line length, lines longer will be reported. Default is 120. - # '\t' is counted as 1 character by default, and can be changed with the tab-width option - line-length: 200 - # tab width in spaces. Default to 1. - tab-width: 1 - unused: - # treat code as a program (not a library) and report unused exported identifiers; default is false. - # XXX: if you enable this setting, unused will report a lot of false-positives in text editors: - # if it's called for subdir of a project it can't find funcs usages. All text editor integrations - # with golangci-lint call it on a directory with the changed file. - check-exported: false - unparam: - # call graph construction algorithm (cha, rta). In general, use cha for libraries, - # and rta for programs with main packages. Default is cha. - algo: cha - - # Inspect exported functions, default is false. Set to true if no external program/library imports your code. - # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors: - # if it's called for subdir of a project it can't find external interfaces. All text editor integrations - # with golangci-lint call it on a directory with the changed file. - check-exported: false - nakedret: - # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 - max-func-lines: 30 - prealloc: - # XXX: we don't recommend using this linter before doing performance profiling. - # For most programs usage of prealloc will be a premature optimization. - - # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them. - # True by default. - simple: true - range-loops: true # Report preallocation suggestions on range loops, true by default - for-loops: false # Report preallocation suggestions on for loops, false by default - -linters: - enable-all: true - disable: - - gas - - typecheck - - megacheck - disable-all: false - fast: false - - -issues: - # List of regexps of issue texts to exclude, empty list by default. - # But independently from this option we use default exclude patterns, - # it can be disabled by `exclude-use-default: false`. To list all - # excluded by default patterns execute `golangci-lint run --help` - exclude: [] - - # Independently from option `exclude` we use default exclude patterns, - # it can be disabled by this option. To list all - # excluded by default patterns execute `golangci-lint run --help`. - # Default value for this option is true. - exclude-use-default: false - - # Maximum issues count per one linter. Set to 0 to disable. Default is 50. - max-per-linter: 0 - - # Maximum count of issues with the same text. Set to 0 to disable. Default is 3. - max-same: 0 - - # Show only new issues: if there are unstaged changes or untracked files, - # only those changes are analyzed, else only changes in HEAD~ are analyzed. - # It's a super-useful option for integration of golangci-lint into existing - # large codebase. It's not practical to fix all existing issues at the moment - # of integration: much better don't allow issues in new code. - # Default is false. - new: false diff --git a/src/initramfs/pkg/userdata/userdata_test.go b/src/initramfs/pkg/userdata/userdata_test.go deleted file mode 100644 index 56ee81d6b..000000000 --- a/src/initramfs/pkg/userdata/userdata_test.go +++ /dev/null @@ -1,52 +0,0 @@ -package userdata - -import ( - "io/ioutil" - "log" - "net/http" - "net/http/httptest" - "os" - "testing" -) - -func TestDownloadRetry(t *testing.T) { - ts := testUDServer(t) - defer ts.Close() - - _, err := Download(ts.URL) - if err != nil { - t.Error("Failed to download userdata", err) - } -} - -func testUDServer(t *testing.T) *httptest.Server { - var count int - - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - count++ - log.Printf("Request %d\n", count) - if count == 4 { - f, err := os.Open("testdata/userdata.yaml") - if err != nil { - log.Println("failed to open") - w.WriteHeader(http.StatusInternalServerError) - return - } - - defer f.Close() - b, err := ioutil.ReadAll(f) - if err != nil { - log.Println("failed to read") - w.WriteHeader(http.StatusInternalServerError) - return - - } - w.Write(b) - return - } - w.WriteHeader(http.StatusInternalServerError) - return - })) - - return ts -} diff --git a/src/rootfs/.conform.yaml b/src/rootfs/.conform.yaml deleted file mode 100644 index 212ae7b3a..000000000 --- a/src/rootfs/.conform.yaml +++ /dev/null @@ -1,106 +0,0 @@ -metadata: - repository: talos/rootfs - variables: - rootfs: /rootfs - srcCNI: https://github.com/containernetworking/cni/releases/download/v0.6.0/cni-amd64-v0.6.0.tgz - srcCNIPlugins: https://github.com/containernetworking/plugins/releases/download/v0.7.4/cni-plugins-amd64-v0.7.4.tgz - srcContainerd: https://github.com/containerd/containerd/releases/download/v1.2.1/containerd-1.2.1.linux-amd64.tar.gz - srcCRITools: https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.13.0/crictl-v1.13.0-linux-amd64.tar.gz - srcLibseccomp: https://github.com/seccomp/libseccomp/releases/download/v2.3.3/libseccomp-2.3.3.tar.gz - srcKubeadm: https://storage.googleapis.com/kubernetes-release/release/v1.13.1/bin/linux/amd64/kubeadm - srcRunc: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc6/runc.amd64 -pipeline: - stages: - - image -stages: - image: - tasks: - - libseccomp - - libblkid - - libuuid - - certs - - crictl - - containerd - - runc - - cni - - kubeadm - - cleanup - - udevd - - test - - rootfs -tasks: - certs: - template: | - RUN mkdir -p {{ index .Variables "rootfs" }}/etc/ssl/certs - RUN curl -o {{ index .Variables "rootfs" }}/etc/ssl/certs/ca-certificates.crt https://curl.haxx.se/ca/cacert.pem - cleanup: - template: | - COPY src/cleanup.sh /toolchain/bin - RUN chmod +x /toolchain/bin/cleanup.sh - RUN /toolchain/bin/cleanup.sh {{ index .Variables "rootfs" }} - containerd: - template: | - RUN curl -L {{ index .Variables "srcContainerd" }} | tar --strip-components=1 -xz -C {{ index .Variables "rootfs" }}/bin - RUN rm {{ index .Variables "rootfs" }}/bin/ctr - crictl: - template: | - RUN curl -L {{ index .Variables "srcCRITools" }} | tar -xz -C {{ index .Variables "rootfs" }}/bin - libblkid: - template: | - RUN cp /toolchain/lib/libblkid.* {{ index .Variables "rootfs" }}/lib - libuuid: - template: | - RUN cp /toolchain/lib/libuuid.* {{ index .Variables "rootfs" }}/lib - libseccomp: - template: | - FROM autonomy/toolchain:690a03a AS {{ .Docker.CurrentStage }} - RUN rm -rf {{ index .Variables "rootfs" }}/etc - RUN mkdir -p {{ index .Variables "rootfs" }}/var/etc - RUN ln -sv var/etc {{ index .Variables "rootfs" }}/etc - WORKDIR /toolchain/usr/local/src/{{ .Docker.CurrentStage }} - RUN curl -L {{index .Variables "srcLibseccomp" }} | tar --strip-components=1 -xz - WORKDIR build - RUN ../configure \ - --prefix=/usr \ - --disable-static - RUN make -j $(($(nproc) / 2)) - RUN make install DESTDIR={{ index .Variables "rootfs" }} - cni: - template: | - RUN ln -sv ../opt {{ index .Variables "rootfs" }}/var/opt - RUN mkdir -p {{ index .Variables "rootfs" }}/opt/cni/bin - RUN curl -L {{ index .Variables "srcCNI" }} | tar -xz -C {{ index .Variables "rootfs" }}/opt/cni/bin - RUN curl -L {{ index .Variables "srcCNIPlugins" }} | tar -xz -C {{ index .Variables "rootfs" }}/opt/cni/bin - kubeadm: - template: | - RUN curl --retry 3 --retry-delay 60 -L {{ index .Variables "srcKubeadm" }} -o {{ index .Variables "rootfs" }}/bin/kubeadm - RUN chmod +x {{ index .Variables "rootfs" }}/bin/kubeadm - test: - template: | - RUN chmod +x ./hack/test.sh - RUN ./hack/test.sh --unit - RUN ./hack/test.sh --lint ./hack/golangci-lint.yaml - udevd: - template: | - FROM autonomy/toolchain:690a03a AS {{ .Docker.CurrentStage }} - RUN mkdir -p /etc/ssl/certs - RUN ln -s /toolchain/etc/ssl/certs/ca-certificates /etc/ssl/certs/ca-certificates - RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.10.1 - ENV GO111MODULE auto - WORKDIR /src/github.com/autonomy/talos/src/rootfs/udevd - COPY ./udevd ./ - RUN go mod download - RUN go mod verify - RUN go mod vendor - CMD ["false"] - RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -ldflags "-s -w" -o /{{ .Docker.CurrentStage }} - rootfs: - template: | - FROM scratch - LABEL maintainer="Andrew Rynhard " - COPY --from=libseccomp {{ index .Variables "rootfs" }} {{ index .Variables "rootfs" }} - COPY --from=udevd /udevd {{ index .Variables "rootfs" }}/bin/udevd - runc: - template: | - RUN curl -L {{ index .Variables "srcRunc" }} -o {{ index .Variables "rootfs" }}/bin/runc - RUN chmod +x {{ index .Variables "rootfs" }}/bin/runc diff --git a/src/rootfs/udevd/go.mod b/src/rootfs/udevd/go.mod deleted file mode 100644 index 55dcd5036..000000000 --- a/src/rootfs/udevd/go.mod +++ /dev/null @@ -1,6 +0,0 @@ -module github.com/autonomy/talos/src/rootfs/udevd - -require ( - github.com/pkg/errors v0.8.0 - golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b -) diff --git a/src/rootfs/udevd/go.sum b/src/rootfs/udevd/go.sum deleted file mode 100644 index 42e7c053b..000000000 --- a/src/rootfs/udevd/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b h1:MQE+LT/ABUuuvEZ+YQAMSXindAdUh7slEmAkup74op4= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/src/rootfs/udevd/hack/test.sh b/src/rootfs/udevd/hack/test.sh deleted file mode 100644 index 1c9db7bdd..000000000 --- a/src/rootfs/udevd/hack/test.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -set -e - -CGO_ENABLED=1 -GOPACKAGES=$(go list ./...) - -lint_packages() { - echo "Linting packages" - golangci-lint run --config ${1} -} - -perform_unit_tests() { - echo "Performing unit tests" - go test -v -short ./... -} - -perform_integration_tests() { - echo "Performing integration tests" - go test -v ./... -} - -perform_coverage_tests() { - echo "Performing coverage tests" - local coverage_report="coverage.txt" - local profile="profile.out" - if [[ -f ${coverage_report} ]]; then - rm ${coverage_report} - fi - touch ${coverage_report} - for package in ${GOPACKAGES[@]}; do - go test -v -short -race -coverprofile=${profile} -covermode=atomic $package - if [ -f ${profile} ]; then - cat ${profile} >> ${coverage_report} - rm ${profile} - fi - done -} - -case $1 in - --lint) - lint_packages ${2} - ;; - --unit) - perform_unit_tests - ;; - --integration) - perform_integration_tests - ;; - --coverage) - perform_coverage_tests - ;; - *) - exit 1 - ;; -esac - -exit 0 diff --git a/src/docs/src/config.toml b/web/config.toml similarity index 100% rename from src/docs/src/config.toml rename to web/config.toml diff --git a/src/docs/src/content/components/_index.md b/web/content/components/_index.md similarity index 100% rename from src/docs/src/content/components/_index.md rename to web/content/components/_index.md diff --git a/src/docs/src/content/components/blockd.md b/web/content/components/blockd.md similarity index 100% rename from src/docs/src/content/components/blockd.md rename to web/content/components/blockd.md diff --git a/src/docs/src/content/components/init.md b/web/content/components/init.md similarity index 100% rename from src/docs/src/content/components/init.md rename to web/content/components/init.md diff --git a/src/docs/src/content/components/kernel.md b/web/content/components/kernel.md similarity index 100% rename from src/docs/src/content/components/kernel.md rename to web/content/components/kernel.md diff --git a/src/docs/src/content/components/kubeadm.md b/web/content/components/kubeadm.md similarity index 100% rename from src/docs/src/content/components/kubeadm.md rename to web/content/components/kubeadm.md diff --git a/src/docs/src/content/components/osctl.md b/web/content/components/osctl.md similarity index 100% rename from src/docs/src/content/components/osctl.md rename to web/content/components/osctl.md diff --git a/src/docs/src/content/components/osd.md b/web/content/components/osd.md similarity index 100% rename from src/docs/src/content/components/osd.md rename to web/content/components/osd.md diff --git a/src/docs/src/content/components/proxyd.md b/web/content/components/proxyd.md similarity index 100% rename from src/docs/src/content/components/proxyd.md rename to web/content/components/proxyd.md diff --git a/src/docs/src/content/components/trustd.md b/web/content/components/trustd.md similarity index 100% rename from src/docs/src/content/components/trustd.md rename to web/content/components/trustd.md diff --git a/src/docs/src/content/configuration/_index.md b/web/content/configuration/_index.md similarity index 100% rename from src/docs/src/content/configuration/_index.md rename to web/content/configuration/_index.md diff --git a/src/docs/src/content/configuration/masters.md b/web/content/configuration/masters.md similarity index 100% rename from src/docs/src/content/configuration/masters.md rename to web/content/configuration/masters.md diff --git a/src/docs/src/content/configuration/osd.md b/web/content/configuration/osd.md similarity index 100% rename from src/docs/src/content/configuration/osd.md rename to web/content/configuration/osd.md diff --git a/src/docs/src/content/configuration/workers.md b/web/content/configuration/workers.md similarity index 100% rename from src/docs/src/content/configuration/workers.md rename to web/content/configuration/workers.md diff --git a/src/docs/src/content/examples/_index.md b/web/content/examples/_index.md similarity index 100% rename from src/docs/src/content/examples/_index.md rename to web/content/examples/_index.md diff --git a/src/docs/src/content/examples/aws.md b/web/content/examples/aws.md similarity index 100% rename from src/docs/src/content/examples/aws.md rename to web/content/examples/aws.md diff --git a/src/docs/src/content/examples/kvm.md b/web/content/examples/kvm.md similarity index 100% rename from src/docs/src/content/examples/kvm.md rename to web/content/examples/kvm.md diff --git a/src/docs/src/content/examples/xen.md b/web/content/examples/xen.md similarity index 100% rename from src/docs/src/content/examples/xen.md rename to web/content/examples/xen.md diff --git a/src/docs/src/content/talos.md b/web/content/talos.md similarity index 100% rename from src/docs/src/content/talos.md rename to web/content/talos.md diff --git a/src/docs/src/themes/autonomy/LICENSE b/web/themes/autonomy/LICENSE similarity index 100% rename from src/docs/src/themes/autonomy/LICENSE rename to web/themes/autonomy/LICENSE diff --git a/src/docs/src/themes/autonomy/README.md b/web/themes/autonomy/README.md similarity index 100% rename from src/docs/src/themes/autonomy/README.md rename to web/themes/autonomy/README.md diff --git a/src/docs/src/themes/autonomy/archetypes/default.md b/web/themes/autonomy/archetypes/default.md similarity index 100% rename from src/docs/src/themes/autonomy/archetypes/default.md rename to web/themes/autonomy/archetypes/default.md diff --git a/src/docs/src/themes/autonomy/layouts/404.html b/web/themes/autonomy/layouts/404.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/404.html rename to web/themes/autonomy/layouts/404.html diff --git a/src/docs/src/themes/autonomy/layouts/_default/index.json b/web/themes/autonomy/layouts/_default/index.json similarity index 100% rename from src/docs/src/themes/autonomy/layouts/_default/index.json rename to web/themes/autonomy/layouts/_default/index.json diff --git a/src/docs/src/themes/autonomy/layouts/_default/list.html b/web/themes/autonomy/layouts/_default/list.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/_default/list.html rename to web/themes/autonomy/layouts/_default/list.html diff --git a/src/docs/src/themes/autonomy/layouts/_default/single.html b/web/themes/autonomy/layouts/_default/single.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/_default/single.html rename to web/themes/autonomy/layouts/_default/single.html diff --git a/src/docs/src/themes/autonomy/layouts/index.html b/web/themes/autonomy/layouts/index.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/index.html rename to web/themes/autonomy/layouts/index.html diff --git a/src/docs/src/themes/autonomy/layouts/partials/footer.html b/web/themes/autonomy/layouts/partials/footer.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/partials/footer.html rename to web/themes/autonomy/layouts/partials/footer.html diff --git a/src/docs/src/themes/autonomy/layouts/partials/head.html b/web/themes/autonomy/layouts/partials/head.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/partials/head.html rename to web/themes/autonomy/layouts/partials/head.html diff --git a/src/docs/src/themes/autonomy/layouts/partials/navbar.html b/web/themes/autonomy/layouts/partials/navbar.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/partials/navbar.html rename to web/themes/autonomy/layouts/partials/navbar.html diff --git a/src/docs/src/themes/autonomy/layouts/partials/sidebar.html b/web/themes/autonomy/layouts/partials/sidebar.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/partials/sidebar.html rename to web/themes/autonomy/layouts/partials/sidebar.html diff --git a/src/docs/src/themes/autonomy/layouts/shortcodes/note.html b/web/themes/autonomy/layouts/shortcodes/note.html similarity index 100% rename from src/docs/src/themes/autonomy/layouts/shortcodes/note.html rename to web/themes/autonomy/layouts/shortcodes/note.html diff --git a/src/docs/src/themes/autonomy/static/css/colors.css b/web/themes/autonomy/static/css/colors.css similarity index 100% rename from src/docs/src/themes/autonomy/static/css/colors.css rename to web/themes/autonomy/static/css/colors.css diff --git a/src/docs/src/themes/autonomy/static/css/dimensions.css b/web/themes/autonomy/static/css/dimensions.css similarity index 100% rename from src/docs/src/themes/autonomy/static/css/dimensions.css rename to web/themes/autonomy/static/css/dimensions.css diff --git a/src/docs/src/themes/autonomy/static/css/fonts.css b/web/themes/autonomy/static/css/fonts.css similarity index 100% rename from src/docs/src/themes/autonomy/static/css/fonts.css rename to web/themes/autonomy/static/css/fonts.css diff --git a/src/docs/src/themes/autonomy/static/css/main.css b/web/themes/autonomy/static/css/main.css similarity index 100% rename from src/docs/src/themes/autonomy/static/css/main.css rename to web/themes/autonomy/static/css/main.css diff --git a/src/docs/src/themes/autonomy/static/css/milligram.min.css b/web/themes/autonomy/static/css/milligram.min.css similarity index 100% rename from src/docs/src/themes/autonomy/static/css/milligram.min.css rename to web/themes/autonomy/static/css/milligram.min.css diff --git a/src/docs/src/themes/autonomy/static/css/milligram.min.css.map b/web/themes/autonomy/static/css/milligram.min.css.map similarity index 100% rename from src/docs/src/themes/autonomy/static/css/milligram.min.css.map rename to web/themes/autonomy/static/css/milligram.min.css.map diff --git a/src/docs/src/themes/autonomy/static/css/navbar.css b/web/themes/autonomy/static/css/navbar.css similarity index 100% rename from src/docs/src/themes/autonomy/static/css/navbar.css rename to web/themes/autonomy/static/css/navbar.css diff --git a/src/docs/src/themes/autonomy/static/css/navigation.css b/web/themes/autonomy/static/css/navigation.css similarity index 100% rename from src/docs/src/themes/autonomy/static/css/navigation.css rename to web/themes/autonomy/static/css/navigation.css diff --git a/src/docs/src/themes/autonomy/static/css/sidebar.css b/web/themes/autonomy/static/css/sidebar.css similarity index 100% rename from src/docs/src/themes/autonomy/static/css/sidebar.css rename to web/themes/autonomy/static/css/sidebar.css diff --git a/src/docs/src/themes/autonomy/static/img/favicon.png b/web/themes/autonomy/static/img/favicon.png similarity index 100% rename from src/docs/src/themes/autonomy/static/img/favicon.png rename to web/themes/autonomy/static/img/favicon.png diff --git a/src/docs/src/themes/autonomy/static/img/logo.svg b/web/themes/autonomy/static/img/logo.svg similarity index 100% rename from src/docs/src/themes/autonomy/static/img/logo.svg rename to web/themes/autonomy/static/img/logo.svg diff --git a/src/docs/src/themes/autonomy/static/js/search.js b/web/themes/autonomy/static/js/search.js similarity index 100% rename from src/docs/src/themes/autonomy/static/js/search.js rename to web/themes/autonomy/static/js/search.js diff --git a/src/docs/src/themes/autonomy/theme.toml b/web/themes/autonomy/theme.toml similarity index 100% rename from src/docs/src/themes/autonomy/theme.toml rename to web/themes/autonomy/theme.toml