Merge pull request #4 from eyenx/fix/access-token

msiegenthaler · web-flow · commit 26a18870d2d3 · 2022-05-13T08:21:41.000+02:00
fix(semantic-release.yaml): switch to default GITHUB_TOKEN
diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml
@@ -26,38 +26,49 @@ jobs:
         with:
           go-version: 1.17.x
 
-      - name: Run GolangCI-Lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          args: --timeout 3m
+#      - name: Run GolangCI-Lint
+#        uses: golangci/golangci-lint-action@v3
+#        with:
+#          args: --timeout 3m
 
   test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.17.x
-      - name: Build App
-        run: go build -v ./...
-      - name: Test App
-        run: go test -v ./...
 
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.17.x
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2.9.1
-        with:
-          version: latest
-          args: --snapshot --skip-publish --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Test build
+        id: docker_build
+        uses: docker/build-push-action@v2
+
+#      - name: Set up Go
+#        uses: actions/setup-go@v3
+#        with:
+#          go-version: 1.17.x
+#      - name: Build App
+#        run: go build -v ./...
+#      - name: Test App
+#        run: go test -v ./...
+
+#  goreleaser:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#      - name: Set up Go
+#        uses: actions/setup-go@v3
+#        with:
+#          go-version: 1.17.x
+#      - name: Run GoReleaser
+#        uses: goreleaser/goreleaser-action@v2.9.1
+#        with:
+#          version: latest
+#          args: --snapshot --skip-publish --rm-dist
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -2,33 +2,99 @@
 name: Release App
 
 on:
-  release:
-    types:
-      - created
+  push:
+    branches: master
+    tags:
+      - 'v*.*.*'
 
 jobs:
-  goreleaser:
+  container:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.17.x
-      - name: Login to GitHub Container Registry
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Prepare Image Metadata
+        id: prep
+        run: |
+          DOCKER_IMAGE=ghcr.io/linkyard/cloudscale-slb-controller
+          VERSION=noop
+          if [ "${{ github.event_name }}" = "schedule" ]; then
+            VERSION=nightly
+          elif [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
+            if [ "${{ github.event.repository.default_branch }}" = "$VERSION" ]; then
+              VERSION=edge
+            fi
+          elif [[ $GITHUB_REF == refs/pull/* ]]; then
+            VERSION=pr-${{ github.event.number }}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            MINOR=${VERSION%.*}
+            MAJOR=${MINOR%.*}
+            TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:latest"
+          elif [ "${{ github.event_name }}" = "push" ]; then
+            TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"
+          fi
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+      - name: Login to GHCR
         uses: docker/login-action@v1
-        if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2.9.1
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
         with:
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          context: ./src
+          file: ./src/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          labels: |
+            org.opencontainers.image.title=${{ github.event.repository.name }}
+            org.opencontainers.image.description=${{ github.event.repository.description }}
+            org.opencontainers.image.url=${{ github.event.repository.html_url }}
+            org.opencontainers.image.source=${{ github.event.repository.clone_url }}
+            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
+            org.opencontainers.image.licenses=${{ github.event.repository.license.spdx_id }}
+
+  #  goreleaser:
+  #    runs-on: ubuntu-latest
+  #    steps:
+  #      - name: Checkout
+  #        uses: actions/checkout@v3
+  #        with:
+  #          fetch-depth: 0
+  #      - name: Set up Go
+  #        uses: actions/setup-go@v3
+  #        with:
+  #          go-version: 1.17.x
+  #      - name: Login to GitHub Container Registry
+  #        uses: docker/login-action@v1
+  #        if: github.event_name != 'pull_request'
+  #        with:
+  #          registry: ghcr.io
+  #          username: ${{ github.actor }}
+  #          password: ${{ secrets.GITHUB_TOKEN }}
+  #      - name: Run GoReleaser
+  #        uses: goreleaser/goreleaser-action@v2.9.1
+  #        with:
+  #          version: latest
+  #          args: release --rm-dist
+  #        env:
+  #          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/semantic-release.yaml b/.github/workflows/semantic-release.yaml
@@ -18,5 +18,5 @@ jobs:
         id: semrel
         uses: go-semantic-release/action@v1.17
         with:
-          github-token: ${{ secrets.BOT_ACCESS_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           allow-initial-development-versions: true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,19 @@
+repos:
+  - repo: https://github.com/TekWizely/pre-commit-golang
+    rev: v1.0.0-beta.5
+    hooks:
+      - id: go-fmt
+      - id: go-vet-mod
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-symlinks
+      - id: check-merge-conflict
+      - id: check-case-conflict
+      - id: detect-aws-credentials
+        args:
+          - --allow-missing-credentials
+      - id: detect-private-key
+      - id: forbid-new-submodules
diff --git a/README.md b/README.md
@@ -18,16 +18,16 @@ The following annotations on services of type `LoadBalancer` are supported:
 
 The following configuration flags are supported:
 
-- `-cloudscale-token`, `CLOUDSCALE_TOKEN`, no default, required: cloudscale.ch API token with 
+- `-cloudscale-token`, `CLOUDSCALE_TOKEN`, no default, required: cloudscale.ch API token with
   write access
 - `-ip-limit`, `IP_LIMIT`, default `5`: maximum number of floating ips that are allowed to exist on
   the cloudscale.ch account; this is used as an additional guard in case this controller is out of
   control and would create an infinite amount of floating ips
 - `-controller-id`, `CONTROLLER_ID`, no default: if set, the controller will only process services
   with a `linkyard.ch/slb-controller-id` annotation set to this value
-- `-leader-election-configmap`, `LEADER_ELECTION_CONFIGMAP`, no default: name of the `ConfigMap` 
+- `-leader-election-configmap`, `LEADER_ELECTION_CONFIGMAP`, no default: name of the `ConfigMap`
   to use for leader election
-- `-leader-election-namespace` `LEADER_ELECTION_NAMESPACE`, no default: name of the namespace where 
+- `-leader-election-namespace` `LEADER_ELECTION_NAMESPACE`, no default: name of the namespace where
   the `ConfigMap` for leader election is located at
 - `-leader-election-node`, `LEADER_ELECTION_NODE`, no default: name of the pod
 - `-leader-election-ttl`, `LEADER_ELECTION_TTL`, default `10s`: TTL for leader election, e.g. `10s`;
@@ -36,7 +36,7 @@ The following configuration flags are supported:
   `Panic`, `Fatal`, `Error`, `Warn`, `Info`, `Debug`, `Trace`
 - `-kubeconfig`, `KUBECONFIG`, no default, not required: path to a kubernetes kubconfig file; this
   is not required when running inside a kubernetes cluster
-- `-fake-cloudscale-client`, `FAKE_CLOUDSCALE_CLIENT`: set to `true` to use a fake cloudscale.ch 
+- `-fake-cloudscale-client`, `FAKE_CLOUDSCALE_CLIENT`: set to `true` to use a fake cloudscale.ch
   API client
-- `-chaos-chance`, `CHAOS_CHANCE`, default `0`: chance of a call to one of the fake components failing; 
+- `-chaos-chance`, `CHAOS_CHANCE`, default `0`: chance of a call to one of the fake components failing;
   range `[0.0,1,0)`
diff --git a/cmd/cloudscale_slb_controller/main.go b/cmd/cloudscale_slb_controller/main.go
@@ -29,7 +29,7 @@ Flags:
 -cloudscale-token           cloudscale.ch API token [CLOUDSCALE_TOKEN]
 
 -ip-limit					maximum number of floating ips that are allowed to exist on the
-                            cloudscale.ch account (default: 5); used to make sure we don't go 
+                            cloudscale.ch account (default: 5); used to make sure we don't go
                             bankrupt if this component runs amok [IP_LIMIT]
 
 -kubeconfig                 path to a kubernetes kubeconfig [KUBECONFIG]
diff --git a/deploy/rbac.yaml b/deploy/rbac.yaml
@@ -92,4 +92,4 @@ roleRef:
   name: cloudscale-slb-controller
 subjects:
   - kind: ServiceAccount
-    name: cloudscale-slb-controller
+    name: cloudscale-slb-controller
diff --git a/glide.yaml b/glide.yaml
@@ -13,4 +13,4 @@ import:
   - package: github.com/evanphx/json-patch
   - package: github.com/imdario/mergo
   - package: github.com/spf13/pflag
-  - package: github.com/namsral/flag
+  - package: github.com/namsral/flag
diff --git a/internal/event_processor.go b/internal/event_processor.go
@@ -144,9 +144,9 @@ func (processor *EventProcessor) ReAttach(namespace string, name string) (*v1.Se
 	svc, err := processor.k8sClient.CoreV1().Services(namespace).Get(name, metav1.GetOptions{})
 	if err != nil {
 		log.WithFields(log.Fields{
-			"svc":         getKeyFor(namespace, name),
-			"action":      "ReAttach",
-			"error":       err,
+			"svc":    getKeyFor(namespace, name),
+			"action": "ReAttach",
+			"error":  err,
 		}).Error("unable to re-attach ip")
 		processor.emitEvent(
 			"Warning",
@@ -165,10 +165,10 @@ func (processor *EventProcessor) VerifyIp(svc *v1.Service) error {
 	ip, serverName, err := processor.verifyIp(svc)
 	if err != nil {
 		log.WithFields(log.Fields{
-			"svc":    getKey(svc),
-			"action": "VerifyIp",
+			"svc":         getKey(svc),
+			"action":      "VerifyIp",
 			"server_name": serverName,
-			"error":  err,
+			"error":       err,
 		}).Error("unable to verify ip")
 		processor.emitEvent(
 			"Warning",
