move oci-distribution out of krustlet

Signed-off-by: Matthew Fisher <[email protected]>

Author: bacongobbler

.cargo/config

@@ -4,6 +4,7 @@ on:
     branches:
       - main
   pull_request: {}
+
 jobs:
   build:
     runs-on: ${{ matrix.config.os }}
@@ -61,7 +62,7 @@ jobs:
           cd /tmp
           git clone https://github.com/openssl/openssl
           cd openssl
-          git checkout OpenSSL_1_1_1h
+          git checkout OpenSSL_1_1_1l
           sudo mkdir -p $OPENSSL_DIR
           ./Configure linux-aarch64 --prefix=$OPENSSL_DIR --openssldir=$OPENSSL_DIR shared
           make CC=aarch64-linux-gnu-gcc
@@ -71,6 +72,7 @@ jobs:
         run: |
           just build ${{ matrix.config.args }}
           just test
+
   windows-build:
     runs-on: windows-latest
     defaults:
@@ -89,85 +91,6 @@ jobs:
         run: |
           just --justfile justfile-windows build
           just --justfile justfile-windows test
-  windows-e2e:
-    env:
-      # Because we are on a shared build machine, we need to use a different directory than the default homedir
-      KRUSTLET_DATA_DIR: ".krustlet"
-      CONFIG_DIR: '.krustlet\config'
-    runs-on: [self-hosted, windows, x64]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: engineerd/[email protected]
-        with:
-          name: just.exe
-          url: "https://github.com/casey/just/releases/download/v0.9.4/just-v0.9.4-x86_64-pc-windows-msvc.zip"
-          pathInArchive: just.exe
-      - uses: engineerd/[email protected]
-        with:
-          name: kind.exe
-          url: "https://kind.sigs.k8s.io/dl/v0.11.1/kind-windows-amd64"
-      - name: Ensure Docker is running
-        run: .\tests\windows\ensure-docker.ps1
-      - name: Setup kind cluster
-        run: kind create cluster --config .\tests\windows\kind-config.yaml --name kind-${{ github.run_id }}
-      # Because Windows uses rustls, it can't use a bare IP address. This
-      # switches the kubeconfig file to use localhost instead
-      - name: Modify kubeconfig
-        run: |
-          kubectl config view -o jsonpath='{.clusters[?(@.name == \"kind-kind-${{ github.run_id }}\")].cluster.server}' | % {$_.replace("127.0.0.1", "localhost")} | % {kubectl config set clusters.kind-kind-${{ github.run_id }}.server $_}
-      - name: Get NODE_IP
-        run: |
-          $addr = (Get-NetIPAddress -AddressFamily IPV4 -InterfaceAlias 'vEthernet (WSL)').IPAddress
-          echo "KRUSTLET_NODE_IP=$addr" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
-      - name: Run e2e tests (full)
-        if: ${{ github.event_name == 'push' }}
-        env:
-          KRUSTLET_TEST_ENV: "ci"
-          KRUSTLET_E2E_IMAGE_PULL_SECRET: ${{ secrets.KRUSTLET_E2E_IMAGE_PULL_SECRET }}
-          KRUSTLET_NODE_IP: ${{ env.KRUSTLET_NODE_IP }}
-        run: just --justfile justfile-windows test-e2e-standalone
-      - name: Run e2e tests (PR)
-        if: ${{ github.event_name == 'pull_request' }}
-        run: just --justfile justfile-windows test-e2e-standalone
-      - uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: e2e-logs-windows
-          path: oneclick-logs/
-      - name: Cleanup kind cluster
-        if: ${{ always() }}
-        run: kind delete cluster --name kind-${{ github.run_id }}
-  e2e:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: engineerd/[email protected]
-        with:
-          version: "v0.11.1"
-      - uses: engineerd/[email protected]
-        with:
-          name: just
-          url: https://github.com/casey/just/releases/download/v0.5.11/just-v0.5.11-x86_64-unknown-linux-musl.tar.gz
-          pathInArchive: just
-      - name: Get NODE_IP
-        run: echo "KRUSTLET_NODE_IP=$(ip addr ls eth0 | awk '/inet / {split($2, ary, /\//); print ary[1]}')" >> $GITHUB_ENV
-      - name: Apply RBAC rules for CSI tests
-        run: kubectl apply -f tests/csi/rbac.yaml
-      - name: Run e2e tests (full)
-        if: ${{ github.event_name == 'push' }}
-        env:
-          KRUSTLET_TEST_ENV: "ci"
-          KRUSTLET_E2E_IMAGE_PULL_SECRET: ${{ secrets.KRUSTLET_E2E_IMAGE_PULL_SECRET }}
-          KRUSTLET_NODE_IP: ${{ env.KRUSTLET_NODE_IP }}
-        run: just test-e2e-standalone
-      - name: Run e2e tests (PR)
-        if: ${{ github.event_name == 'pull_request' }}
-        run: just test-e2e-standalone
-      - uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: e2e-logs
-          path: oneclick-logs/
 
   cargo-deny:
     name: Run cargo deny
@@ -177,7 +100,6 @@ jobs:
         checks:
           - advisories
           - bans licenses sources
-
     steps:
       - uses: actions/checkout@v2
       - uses: EmbarkStudios/cargo-deny-action@v1

.github/workflows/build.yml

@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
-      - uses: actions-rs/audit-check@v1.2.0
+      - uses: actions-rs/audit-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/daily_security.yml

@@ -1,150 +1,13 @@
 name: release
 on:
   push:
-    branches:
-      - main
     tags:
       - "v*"
 jobs:
-  build:
-    name: build release assets
-    runs-on: ${{ matrix.config.os }}
-    env: ${{ matrix.config.env }}
-    strategy:
-      matrix:
-        config:
-          - {
-              os: "ubuntu-latest",
-              arch: "amd64",
-              args: "--release",
-              targetDir: "target/release",
-              extension: "",
-              env: {},
-            }
-          - {
-              os: "ubuntu-latest",
-              arch: "aarch64",
-              args: "--release --target aarch64-unknown-linux-gnu",
-              targetDir: "target/aarch64-unknown-linux-gnu/release",
-              extension: "",
-              env: { OPENSSL_DIR: "/usr/local/openssl-aarch64" },
-            }
-          - {
-              os: "macos-latest",
-              arch: "amd64",
-              args: "--release",
-              targetDir: "target/release",
-              extension: "",
-              env: {},
-            }
-          - {
-              os: "windows-latest",
-              arch: "amd64",
-              args: "--release --no-default-features --features rustls-tls",
-              targetDir: "target/release",
-              extension: ".exe",
-              env: {},
-            }
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: set the release version (tag)
-        if: startsWith(github.ref, 'refs/tags/v')
-        shell: bash
-        run: echo "RELEASE_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-
-      - name: set the release version (main)
-        if: github.ref == 'refs/heads/main'
-        shell: bash
-        run: echo "RELEASE_VERSION=canary" >> $GITHUB_ENV
-
-      - name: lowercase the runner OS name
-        shell: bash
-        run: |
-          OS=$(echo "${{ runner.os }}" | tr '[:upper:]' '[:lower:]')
-          echo "RUNNER_OS=${OS}" >> $GITHUB_ENV
-
-      # hack(bacongobbler): install rustfmt to work around darwin toolchain issues
-      - name: "(macOS) install dev tools"
-        if: runner.os == 'macOS'
-        run: |
-          rustup component add rustfmt --toolchain stable-x86_64-apple-darwin
-          rustup component add clippy --toolchain stable-x86_64-apple-darwin
-          rustup update stable
-
-      - name: setup for cross-compile builds
-        if: matrix.config.arch == 'aarch64'
-        run: |
-          sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
-          cd /tmp
-          git clone https://github.com/openssl/openssl
-          cd openssl
-          git checkout OpenSSL_1_1_1h
-          sudo mkdir -p $OPENSSL_DIR
-          ./Configure linux-aarch64 --prefix=$OPENSSL_DIR --openssldir=$OPENSSL_DIR shared
-          make CC=aarch64-linux-gnu-gcc
-          sudo make install
-          rustup target add aarch64-unknown-linux-gnu
-
-      - name: build release
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: ${{ matrix.config.args }}
-
-      - name: package release assets
-        shell: bash
-        run: |
-          mkdir _dist
-          cp README.md LICENSE ${{ matrix.config.targetDir }}/krustlet-wasi${{ matrix.config.extension }} _dist/
-          cd _dist
-          tar czf krustlet-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz README.md LICENSE krustlet-wasi${{ matrix.config.extension }}
-
-      - uses: actions/upload-artifact@v1
-        with:
-          name: krustlet
-          path: _dist/krustlet-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
   publish:
-    name: publish release assets
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: set the release version
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: echo "RELEASE_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-      - name: set the release version
-        if: github.ref == 'refs/heads/main'
-        run: echo "RELEASE_VERSION=canary" >> $GITHUB_ENV
-      - name: download release assets
-        uses: actions/download-artifact@v1
-        with:
-          name: krustlet
-      - name: generate checksums
-        run: |
-          cd krustlet
-          sha256sum * > checksums-${{ env.RELEASE_VERSION }}.txt
-      - name: upload to azure
-        uses: bacongobbler/azure-blob-storage-upload@main
-        with:
-          source_dir: krustlet
-          container_name: releases
-          connection_string: ${{ secrets.AzureStorageConnectionString }}
-          sync: false
-  crates:
     name: publish to crates.io
     runs-on: ubuntu-latest
-    needs: publish
-    if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v2
-      # OCI distribution needs to go first because kubelet has a dependency on it
       - name: publish oci-distribution to crates.io
-        working-directory: ./crates/oci-distribution
-        run: cargo publish --token ${{ secrets.CargoToken }}
-        continue-on-error: true
-      - name: wait for oci-distribution to be published
-        run: sleep 60
-      - name: publish kubelet to crates.io
-        working-directory: ./crates/kubelet
         run: cargo publish --token ${{ secrets.CargoToken }}
-        continue-on-error: true

.github/workflows/release.yml

@@ -11,10 +11,10 @@ attest that you have the right to contribute that code. This is done with the
 
 ## Pull Request Management
 
-All code that is contributed to Krustlet must go through the Pull Request (PR)
-process. To contribute a PR, fork this project, create a new branch, make
-changes on that branch, and then use GitHub to open a pull request with your
-changes.
+All code that is contributed to oci-distribution must go through the Pull
+Request (PR) process. To contribute a PR, fork this project, create a new
+branch, make changes on that branch, and then use GitHub to open a pull request
+with your changes.
 
 Every PR must be reviewed by at least one Core Maintainer of the project. Once
 a PR has been marked "Approved" by a Core Maintainer (and no other core