[pull] develop from bottlerocket-os:develop

.dockerignore

@@ -1,7 +1,11 @@
 /.git
 /.gomodcache
 /build/*
+!/build/rpms/
+/build/rpms/*
 !/build/rpms/*.rpm
 /build/rpms/*-debuginfo-*.rpm
 /build/rpms/*-debugsource-*.rpm
 **/target/*
+/sbkeys
+/tests

.github/ISSUE_TEMPLATE/build.md

@@ -1,6 +1,7 @@
 ---
 name: Bug report - build process
 about: Let us know about a problem with the build process
+labels: status/needs-triage, type/bug
 ---
 
 <!--

.github/ISSUE_TEMPLATE/feature.md

@@ -1,6 +1,7 @@
 ---
 name: Feature request
 about: Request a change to to the project
+labels: status/needs-triage, type/enhancement
 ---
 
 <!--

.github/ISSUE_TEMPLATE/image.md

@@ -1,6 +1,7 @@
 ---
 name: Bug report - Bottlerocket image
 about: Let us know about a problem with Bottlerocket
+labels: status/needs-triage, type/bug
 ---
 
 <!--

.github/ISSUE_TEMPLATE/metal_driver.md

@@ -0,0 +1,26 @@
+---
+name: bare metal variant - driver request
+about: Request a driver to be added to the metal variant of Bottlerocket
+labels: status/needs-triage, area/metal, type/enhancement
+---
+
+<!--
+Tips:
+- Please search for similar requests, including closed issues.
+- Please include details about the hardware you want supported
+- Please provide the in-kernel driver name used for the device (if you know).
+- Please read [SUPPORTED-HARDWARE.md](https://github.com/bottlerocket-os/bottlerocket/blob/develop/SUPPORTED-HARDWARE.md).
+-->
+
+**What I'd like:**
+
+**Device type (e.g. network interface, disk controller):**
+
+**Device vendor:**
+
+**Device model:**
+
+**Driver used on other Linux distribition:**
+
+**Any alternatives you've considered:**
+

.github/actions/setup-node/action.yml

@@ -0,0 +1,32 @@
+name: "Node setup"
+description: "Performs setup for caching and other common needs."
+inputs:
+  perform-cache-cleanup:
+    description: "Whether to perform cache cleanup"
+    required: false
+    default: false
+    type: boolean
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        echo "OS_ARCH=`uname -m`" >> $GITHUB_ENV
+        sudo apt -y install build-essential openssl libssl-dev pkg-config liblz4-tool
+      shell: bash
+    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+      # Cache `cargo-make`, `cargo-cache`
+      with:
+        path: |
+          ~/.cargo
+        key: ${{ hashFiles('.github/workflows/cache.yml') }}-${{ runner.os }}-${{ env.OS_ARCH }}
+    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+      # Cache first-party code dependencies
+      with:
+        path: |
+          .cargo
+        key: ${{ hashFiles('.github/workflows/cache.yml') }}-${{ runner.os }}-${{ env.OS_ARCH }}-${{ hashFiles('sources/Cargo.lock') }}
+    - run: cargo install cargo-make
+      shell: bash
+    - if: ${{ inputs.perform-cache-cleanup }}
+      run: cargo install --no-default-features --features ci-autoclean cargo-cache
+      shell: bash

.github/dependabot.yaml

@@ -0,0 +1,28 @@
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "area/dependencies"
+
+  # We maintain updates for most dependencies. This disables updates other than
+  # security ones.
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "area/dependencies"
+    open-pull-requests-limit: 0
+
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "area/dependencies"
+    open-pull-requests-limit: 0

.github/pull_request_template.md

@@ -6,7 +6,7 @@ Tips:
 
 **Issue number:**
 
-
+Closes #
 
 **Description of changes:**
 

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
     branches: [develop]
     # Here we list file types that don't affect the build and don't need to use
     # up our Actions runners.
-    paths-ignore: 
+    paths-ignore:
       # draw.io (diagrams.net) files, the source of png images for docs
       - '**.drawio'
       # Example configuration files
@@ -17,34 +17,38 @@ on:
       - '**.tpl'
       # Sample config files and OpenAPI docs
       - '**.yaml'
+      # Mailmap
+      - '.mailmap'
+
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-    runs-on: [self-hosted, linux, x64]
-    continue-on-error: ${{ matrix.supported }}
+    if: github.repository == 'bottlerocket-os/bottlerocket'
+    runs-on:
+      group: bottlerocket
+      labels: bottlerocket_ubuntu-latest_32-core
+    continue-on-error: true
     strategy:
       matrix:
-        variant: [aws-k8s-1.18, aws-k8s-1.19, aws-k8s-1.20, aws-k8s-1.21, aws-ecs-1]
         arch: [x86_64, aarch64]
-        supported: [true]
-        include:
-          - variant: aws-dev
-            arch: x86_64
-            supported: false
-          - variant: vmware-dev
-            arch: x86_64
-            supported: false
-          - variant: vmware-k8s-1.20
-            arch: x86_64
-            supported: true
-          - variant: vmware-k8s-1.21
-            arch: x86_64
-            supported: true
       fail-fast: false
+    name: "Build ${{ matrix.arch }}"
     steps:
-      - uses: actions/checkout@v2
-      - run: rustup toolchain install 1.56.1 && rustup default 1.56.1
-      - run: cargo install --version 0.30.0 cargo-make
-      - run: cargo make -e BUILDSYS_VARIANT=${{ matrix.variant }} unit-tests
-      - run: cargo make -e BUILDSYS_VARIANT=${{ matrix.variant }} check-fmt
-      - run: cargo make -e BUILDSYS_VARIANT=${{ matrix.variant }} -e BUILDSYS_ARCH=${{ matrix.arch }} -e BUILDSYS_JOBS=12
+      - name: Random delay
+        run: |
+          delay=$((1 + $RANDOM % 32))
+          echo "Waiting ${delay} seconds before execution"
+          sleep $delay
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - name: Preflight step to set up the runner
+        uses: ./.github/actions/setup-node
+      - run: rustup component add rustfmt
+      - run: cargo make check
+      - run: |
+          cargo make \
+            -e BUILDSYS_ARCH=${{ matrix.arch }} \
+            -e BUILDSYS_JOBS=12 \
+            build-all

.github/workflows/cache.yml

@@ -0,0 +1,28 @@
+# This workflow caches crate dependencies and build artifacts for tools (except 'test-tools' since we don't use them in build workflows).
+# The cache is only usable by workflows started from pull requests against the develop branch.
+name: CacheDepsAndTools
+on:
+  push:
+    branches: [develop]
+    paths:
+      - '.github/**'
+      - 'sources/Cargo.lock'
+      - 'tools/pubsys*/**'
+      - '!tools/pubsys/policies/**'
+      - '!tools/pubsys/**.example'
+jobs:
+  cache:
+    if: github.repository == 'bottlerocket-os/bottlerocket'
+    runs-on:
+      group: bottlerocket
+      labels: bottlerocket_ubuntu-latest_8-core
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - name: Preflight step to set up the runner
+        uses: ./.github/actions/setup-node
+        with:
+          perform-cache-cleanup: true
+      - run: cargo make install-twoliter
+      # This cleans the cargo cache in ~/.cargo
+      - run: cargo-cache

.github/workflows/weekly.yml

@@ -0,0 +1,40 @@
+# This is basically a duplicate of the main "build" workflow, but uses GOPROXY=direct
+# to try to catch errors close to their introduction due to yanked Go modules. These
+# could otherwise be covered up by caching and not discovered until much later when
+# bypassing the main cache.
+name: Weekly
+on:
+  schedule:
+    # Run Monday at 02:15 UTC. Randomly chosen as a "quiet" time for this to run.
+    # See syntax for format details: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onschedule
+    - cron: '15 2 * * 1'
+
+env:
+  # When Go packages are built, buildsys will vendor in dependent Go code for
+  # that package and bundle it up in a tarball. This env variable is consumed
+  # and used to configure Go to directly download code from its upstream source.
+  # This is a useful early signal during GitHub actions to see if there are
+  # upstream Go code problems.
+  GOPROXY: direct
+
+jobs:
+  build:
+    if: github.repository == 'bottlerocket-os/bottlerocket'
+    runs-on:
+      group: bottlerocket
+      labels: bottlerocket_ubuntu-latest_32-core
+    continue-on-error: false
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      fail-fast: false
+    name: "Build ${{ matrix.arch }}"
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - name: Preflight step to set up the runner
+        uses: ./.github/actions/setup-node
+      - run: |
+          cargo make \
+            -e BUILDSYS_ARCH=${{ matrix.arch }} \
+            -e BUILDSYS_JOBS=12 \
+            build-all

.gitignore

@@ -1,11 +1,20 @@
 /build
 *.tar.*
+*.tgz
 **/target/
 **/vendor/
 /.cargo
 /.gomodcache
 /html
 /Infra.toml
+/Test.toml
+/testsys.kubeconfig
 /*.pem
 /keys
 /roles
+/sbkeys/**/
+/Licenses.toml
+/licenses
+*.run
+/tests
+Twoliter.override

.golangci.yaml

@@ -0,0 +1,18 @@
+linters:
+  enable:
+    - errcheck
+    - goimports
+    - ineffassign
+    - misspell
+    - revive
+    - staticcheck
+    - unconvert
+    - unused
+    - govet
+
+run:
+  timeout: 3m
+issues:
+  exclude-dirs:
+    - vendor
+    - .gomodcache

.mailmap

@@ -6,3 +6,43 @@ Samuel Mendoza-Jonas <samjonas@amazon.com> <53018225+sam-aws@users.noreply.githu
 Tom Kirchner <tjk@amazon.com> <tjkirch@users.noreply.github.com>
 Zac Mrowicki <mrowicki@amazon.com>
 Zac Mrowicki <mrowicki@amazon.com> <zmrowicki@hotmail.com>
+Mahdi Chaker <mmchaker@amazon.com> M <mchaker@users.noreply.github.com>
+Arnaldo Garcia Rincon <agarrcia@amazon.com>
+Arnaldo Garcia Rincon <agarrcia@amazon.com> <asgar.2792@gmail.com>
+Ben Cressey <bcressey@amazon.com> <ben@cressey.org>
+Erikson Tung <etung@amazon.com>
+Jacob Vallejo <jakeev@amazon.com> <jake@jahkeup.com>
+John McBride <jpmmcb@amazon.com> <jpmmcbride@gmail.com>
+Kyle J. Davis <halldirector@gmail.com> <kyledvs@amazon.com>
+Markus Boehme <markubo@amazon.com> <markusboehme@users.noreply.github.com>
+Matthew James Briggs <brigmatt@amazon.com>
+Matthew James Briggs <brigmatt@amazon.com> <6260372+webern@users.noreply.github.com>
+Matthew James Briggs <brigmatt@amazon.com> <matthew.james.briggs@gmail.com>
+Matthew James Briggs <brigmatt@amazon.com> Matt Briggs <mjb@bitflip.software>
+Matthew Yeazel <yeazelm@amazon.com> <67169369+yeazelm@users.noreply.github.com>
+Matthias Sterckx <msterckx@amazon.com>
+Samuel Karp <skarp@amazon.com> <samuelkarp@users.noreply.github.com>
+Sanika Shah <shasanik@amazon.com> <sanikashah1110@gmail.com>
+Sean Kelly <seankell@amazon.com> <sean.kelly.2992@gmail.com>
+Sean McGinnis <stmcg@amazon.com> <sean.mcginnis@gmail.com>
+Sean P. Kelly <seankell@amazon.com> <sean.kelly.2992@gmail.com>
+Shailesh Gothi <gothisg@amazon.com> <shaileshgothiece@gmail.com>
+Tianhao Geng <tianhg@amazon.com> <gthao313@gmail.com>
+Tianhao Geng <tianhg@amazon.com> <45469883+gthao313@users.noreply.github.com>
+Ethan Pullen <pullenep@amazon.com>
+Ethan Pullen <pullenep@amazon.com> <ecpullen@aol.com>
+Shikha Vyaghra <vyaghras@amazon.com> <107685805+vyaghras@users.noreply.github.com>
+Patrick J.P. Culp <jpculp@amazon.com>
+Patrick J.P. Culp <jpculp@amazon.com> <jpculp@gmail.com>
+Piyush Jena <jepiyush@amazon.com> <piyushjena1996@gmail.com>
+Martin Harriman <mharrimn@amazon.com> <larvacea@mac.com>
+Vighnesh Maheshwari <vighmah@amazon.com> <vighnesh.maheshwari@gmail.com>
+Vighnesh Maheshwari <vighmah@amazon.com> <21048293+vigh-m@users.noreply.github.com>
+Kyle Sessions <kssessio@amazon.com>
+Kyle Sessions <kssessio@amazon.com> <KyleC.Sessions1@gmail.com>
+Gaurav Sharma <mgsharm@amazon> <168583863+mgsharm@users.noreply.github.com>
+Gavin Inglis <giinglis@amazon.com> <43075615+ginglis13@users.noreply.github.com>
+Sam Berning <bernings@amazon.com> <113054166+sam-berning@users.noreply.github.com>
+Sparks Song <shijiao@amazon.com> <sparkssj14@gmail.com>
+Sparks Song <shijiao@amazon.com> Sparks <56856447+Sparksssj@users.noreply.github.com>
+Cezar Rata <ceradev@amazon.com> cezar-r <59450965+cezar-r@users.noreply.github.com>

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "rust-analyzer.linkedProjects": [
+        "sources/Cargo.toml"
+    ],
+    "files.insertFinalNewline": true
+}