Merge branch 'master' into enhancement/apt

.bazelversion

@@ -1 +1 @@
-1.2.0
+2.2.0

.github/workflows/main.yml

@@ -0,0 +1,64 @@
+---
+name: build
+
+'on':
+  - push
+  - pull_request
+
+env:
+  GOPROXY: https://proxy.golang.org
+  GOPATH: ${{ github.workspace }}/go
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, macos-10.15]
+        go: [1.13, 1.14]
+        exclude:
+          - os: macos-10.15
+            go: 1.14
+      fail-fast: true
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Set up go
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ matrix.go }}
+        id: go
+
+      - uses: actions/checkout@v2
+        with:
+          path: ${{ env.GOPATH }}/src/k8s.io/kops
+
+      - name: make nodeup examples test
+        working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
+        run: |
+          make nodeup examples test
+
+  verify:
+    strategy:
+      matrix:
+        os: [ubuntu-18.04]
+        go: [1.13]
+      fail-fast: true
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Set up go
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ matrix.go }}
+        id: go
+
+      - uses: actions/checkout@v2
+        with:
+          path: ${{ env.GOPATH }}/src/k8s.io/kops
+
+      - name: make travis-ci
+        working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
+        run: |
+          make travis-ci

.gitignore

@@ -54,6 +54,7 @@ network_closure.sh
 
 # Terraform plans get put here
 /out/
+.terraform
 
 # Docker _src sync
 /docker/_src
@@ -64,7 +65,6 @@ network_closure.sh
 
 # autogenerated code we don't want to check in
 ./go-bindata
-upup/models/bindata.go
 
 # Ignore all Exhuberant Ctags files
 # Removed for now - we have a package named tags
@@ -95,4 +95,4 @@ addons/prometheus-operator/tmp # cloned git repo
 .config
 
 # Used by some of the verify scripts in the hack directory
-_output
+_output

.travis.yml

@@ -1,24 +1,34 @@
 language: go
+arch:
+  - amd64
+  - arm64
 os:
   - linux
   - osx
 go:
-  # 1.12 is now best-effort; we recommend 1.13
-  - "1.12"
-  - "1.13"
+  - 1.13.x
+  - 1.14.x
 
 go_import_path: k8s.io/kops
 
 script:
-  - GOPROXY=https://proxy.golang.org make nodeup examples test
+  - GOPROXY=https://proxy.golang.org travis_wait 30 make nodeup examples test
 
 jobs:
+  allow_failures:
+    - arch: arm64
+
   exclude:
     - os: osx
-      go: "1.12"
+      go: 1.13.x
+    - os: linux
+      go: 1.13.x
+      arch: arm64
+
   include:
     - name: Verify
+      arch: amd64
       os: linux
-      go: "1.13"
+      go: 1.13.x
       script:
         - GOPROXY=https://proxy.golang.org make travis-ci