Downstream sync: July '21

.github/workflows/build.yml

@@ -0,0 +1,31 @@
+on: [push, pull_request]
+name: Build
+jobs:
+  build:
+    strategy:
+      matrix:
+        go-version: [1.15.x, 1.16.x]
+        #goarch: [386, amd64, arm, ppc64le, arm64]
+        goarch: [amd64, arm64]
+        os: [ubuntu-latest] #, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
+
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Install kubebuilder tools
+      run: ./hack/install-kubebuilder-tools.sh
+
+    - name: Generate code
+      run: ./hack/generate-code.sh
+
+    - name: Build
+      env:
+        GOARCH: ${{ matrix.goarch }}
+        GOOS: ${{ matrix.goos }}
+      run: ./hack/build-go.sh

.github/workflows/image-build.yml

@@ -0,0 +1,56 @@
+name: Image build
+on: [pull_request]
+jobs:
+  build-amd64:
+    name: Image build/amd64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build container image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: false
+          tags: ghcr.io/${{ github.repository }}:latest-amd64
+          file: Dockerfile
+
+  build-openshift:
+    name: Image build/amd64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build container image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: false
+          tags: dougbtv/whereabouts-ocp
+          file: Dockerfile.openshift
+
+  build-arm64:
+    name: Image build/arm64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build container image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: false
+          tags: ghcr.io/${{ github.repository }}:latest-arm64
+          file: Dockerfile.arm64

.github/workflows/image-push-master.yml

@@ -0,0 +1,61 @@
+name: Image push for master
+on: 
+  push:
+    branches:
+      - master
+env:
+  image-push-owner: 'k8snetworkplumbingwg'
+jobs:
+  push-amd64:
+    name: Image push/amd64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Container Registry
+        if: github.repository_owner == 'k8snetworkplumbingwg'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push container image
+        if: github.repository_owner == 'k8snetworkplumbingwg'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/${{ github.repository }}:latest-amd64
+          file: Dockerfile
+
+  push-origin:
+    name: Image push/origin
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Container Registry
+        if: github.repository_owner == 'k8snetworkplumbingwg'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push container image
+        if: github.repository_owner == 'k8snetworkplumbingwg'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/${{ github.repository }}:latest-ocp
+          file: Dockerfile.openshift

.github/workflows/image-push-release.yml

@@ -0,0 +1,77 @@
+name: Image push release
+on: 
+  push:
+    tags:
+      - v*
+env:
+  image-push-owner: 'k8snetworkplumbingwg'
+jobs:
+  push-amd64:
+    name: Image push/amd64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Container Registry
+        if: github.repository_owner == 'k8snetworkplumbingwg'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tag-latest: false
+
+      - name: Push container image
+        if: github.repository_owner == 'k8snetworkplumbingwg'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ steps.docker_meta.outputs.tags }}-amd64
+          file: Dockerfile
+
+  push-arm64:
+    name: Image push/arm64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Container Registry
+        if: github.repository_owner == 'k8snetworkplumbingwg'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tag-latest: false
+
+      - name: Push container image
+        if: github.repository_owner == 'k8snetworkplumbingwg'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ steps.docker_meta.outputs.tags }}-arm64
+          file: Dockerfile

.github/workflows/test.yml

@@ -0,0 +1,61 @@
+on: [push, pull_request]
+name: Test
+jobs:
+  test:
+    strategy:
+      matrix:
+        #go-version: [1.15.x, 1.16.x]
+        go-version: [1.15.x]
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
+
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Run Revive Action by building from repository
+      uses: morphy2k/revive-action@v1.4.1
+      with:
+        exclude: "./vendor/..."
+        name: "Revive"
+
+    - name: Install kubebuilder tools
+      run: ./hack/install-kubebuilder-tools.sh
+
+    - name: Generate code
+      run: ./hack/generate-code.sh
+
+    - name: Run go fmt
+      run: go fmt ./...
+      #run: diff -u <(echo -n) <(gofmt -d -s .)
+
+    - name: Run go vet
+      run: go vet ./...
+
+    - name: Install golint
+      run: GO111MODULE=off GOBIN=$(pwd)/bin go get golang.org/x/lint/golint
+
+    - name: Test
+      run: sudo PATH=${PATH}:./bin ./hack/test-go.sh
+
+    - name: Send coverage
+      uses: shogo82148/actions-goveralls@v1
+      with:
+        path-to-profile: coverage.out
+        flag-name: Go-${{ matrix.go }}
+        parallel: true
+      env:
+        KUBEBUILDER_ASSETS: "$(pwd)/bin"
+
+  # notifies that all test jobs are finished.
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: shogo82148/actions-goveralls@v1
+        with:
+          parallel-finished: true

Dockerfile

@@ -6,6 +6,8 @@ COPY . .
 RUN ./hack/build-go.sh
 
 FROM alpine:latest
+LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts
 COPY --from=0 /go/src/github.com/dougbtv/whereabouts/bin/whereabouts .
+COPY --from=0 /go/src/github.com/dougbtv/whereabouts/bin/ip-reconciler .
 COPY script/install-cni.sh .
-CMD ["/install-cni.sh"]
+CMD ["/install-cni.sh"]

Dockerfile.arm64

@@ -0,0 +1,16 @@
+FROM golang:1.13
+ADD . /usr/src/whereabouts
+
+ENV GOARCH "arm64"
+ENV GOOS "linux"
+
+RUN mkdir -p $GOPATH/src/github.com/dougbtv/whereabouts
+WORKDIR $GOPATH/src/github.com/dougbtv/whereabouts
+COPY . .
+RUN ./hack/build-go.sh
+
+FROM arm64v8/alpine:latest
+LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts
+COPY --from=0 /go/src/github.com/dougbtv/whereabouts/bin/whereabouts .
+COPY script/install-cni.sh .
+CMD ["/install-cni.sh"]

Dockerfile.openshift

@@ -6,6 +6,7 @@ ENV CGO_ENABLED=1
 ENV GO111MODULE=on
 ENV VERSION=rhel8 COMMIT=unset
 RUN go build -mod vendor -o bin/whereabouts cmd/whereabouts.go
+RUN go build -mod vendor -o bin/ip-reconciler cmd/reconciler/*.go
 WORKDIR /
 
 FROM registry.ci.openshift.org/ocp/builder:rhel-7-golang-1.16-openshift-4.9 AS rhel7
@@ -24,6 +25,7 @@ RUN mkdir -p /usr/src/whereabouts/images && \
 COPY --from=rhel7 /go/src/github.com/dougbtv/whereabouts/bin/whereabouts /usr/src/whereabouts/rhel7/bin
 COPY --from=rhel8 /go/src/github.com/dougbtv/whereabouts/bin/whereabouts /usr/src/whereabouts/bin
 COPY --from=rhel8 /go/src/github.com/dougbtv/whereabouts/bin/whereabouts /usr/src/whereabouts/rhel8/bin
+COPY --from=rhel8 /go/src/github.com/dougbtv/whereabouts/bin/ip-reconciler /ip-reconciler
 
 LABEL io.k8s.display-name="Whereabouts CNI" \
       io.k8s.description="This is a component of OpenShift Container Platform and provides a cluster-wide IPAM CNI plugin." \