Bump packages (#19)

Author: liranbg

.github/workflows/ci.yaml

@@ -0,0 +1,50 @@
+# Copyright 2019 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+name: CI
+
+on:
+  pull_request:
+    branches:
+    - development
+    - '[0-9]+.[0-9]+.x'
+
+  push:
+    branches:
+    - development
+    - master
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-go@v3
+      with:
+        cache: true
+        go-version-file: "go.mod"
+
+    - name: Run lint
+      run: make lint
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Run build
+      run: make build

.github/workflows/release.yaml

@@ -0,0 +1,56 @@
+# Copyright 2019 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+name: Release
+
+on:
+  release:
+    types:
+      - created
+
+  # Run Release on push to development for unstable
+  push:
+    branches:
+      - development
+
+jobs:
+  release:
+    name: Release Docker Images
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Set unstable
+        if: github.event_name == 'push'
+        run: |
+          echo "LABEL=unstable" >> $GITHUB_ENV
+
+      - name: Set release
+        if: github.event_name == 'release'
+        run: |
+          echo "LABEL=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
+          cat $GITHUB_ENV
+
+      - uses: actions/checkout@v3
+
+      - name: Login to GCR
+        run: |
+          echo "$GCR_JSON_KEY" | docker login -u _json_key --password-stdin https://gcr.io
+        env:
+          GCR_JSON_KEY: ${{ secrets.GCR_IGUAZIO_JSON_KEY }}
+
+      - name: Build image
+        run: make build
+
+      - name: Push image
+        run: make push

.gitignore

@@ -10,3 +10,8 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+
+.vscode
+.idea
+.github/.act
+.bin

.travis.yml

@@ -1,66 +1,42 @@
-LOCATOR_PATH ?= src/github.com/v3io/locator
-LOCATOR_TAG ?= latest
-LOCATOR_REPOSITORY ?= v3io/
-LOCATOR_BUILD_COMMAND ?= CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags="-s -w" -o $(GOPATH)/bin/locatorctl $(GOPATH)/$(LOCATOR_PATH)/cmd/locatorctl/main.go
-
-.PHONY: all
-all: lint build
-	@echo Done.
+# Copyright 2019 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LABEL ?= unstable
+REPOSITORY ?= gcr.io/iguazio
+IMAGE = $(REPOSITORY)/locator:$(LABEL)
 
 .PHONY: build
 build:
-	docker build --tag=$(LOCATOR_REPOSITORY)locator:$(LOCATOR_TAG) .
-
-.PHONY: ensure-gopath bin
-bin:
-	$(LOCATOR_BUILD_COMMAND)
+	@docker build \
+		--file cmd/locator/Dockerfile \
+		--tag=$(IMAGE) \
+		.
 
-.PHONY: ensure-gopath lint
-lint: ensure-gopath
-	@echo $(GOPATH)
-	@echo Installing linters...
-	go get -u gopkg.in/alecthomas/gometalinter.v2
-	@$(GOPATH)/bin/gometalinter.v2 --install
+.PHONY: push
+push:
+	docker push $(IMAGE)
 
-	@echo Linting...
-	@$(GOPATH)/bin/gometalinter.v2 \
-		--deadline=300s \
-		--disable-all \
-		--enable-gc \
-		--enable=deadcode \
-		--enable=goconst \
-		--enable=gofmt \
-		--enable=golint \
-		--enable=gosimple \
-		--enable=ineffassign \
-		--enable=interfacer \
-		--enable=misspell \
-		--enable=staticcheck \
-		--enable=unconvert \
-		--enable=varcheck \
-		--enable=vet \
-		--enable=vetshadow \
-		--enable=errcheck \
-		--exclude="_test.go" \
-		--exclude="comment on" \
-		--exclude="error should be the last" \
-		--exclude="should have comment" \
-		./cmd/... ./pkg/...
+.PHONY: lint
+lint:
+	./hack/lint/install.sh
+	./hack/lint/run.sh
 
-	@echo Done.
-
-.PHONY: vet
-vet:
-	go vet ./cmd/...
-	go vet ./pkg/...
+.PHONY: fmt
+fmt:
+	@go fmt $(shell go list ./... | grep -v /vendor/)
 
 .PHONY: test
 test:
-	go test -v ./cmd/...
-	go test -v ./pkg/...
-
-.PHONY: ensure-gopath
-ensure-gopath:
-	ifndef GOPATH
-		$(error GOPATH must be set)
-	endif
+	go test -p1 -v ./pkg/...

Dockerfile

@@ -0,0 +1,46 @@
+# Copyright 2019 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+FROM gcr.io/iguazio/golang:1.19 as builder
+
+# copy source tree
+WORKDIR /app
+
+COPY go.mod go.sum ./
+
+RUN go mod download
+
+COPY . .
+
+# build the app
+RUN GOOS=linux \
+    GOARCH=amd64 \
+    CGO_ENABLED=0 \
+    go build -a -installsuffix cgo -ldflags="-s -w" -o locatorctl cmd/locator/main.go
+
+#
+# Output stage: Copies binary to an alpine based image
+#
+
+FROM debian:stretch-slim
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends ca-certificates && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# copy app binary from build stage
+COPY --from=builder /app/locatorctl /usr/local/bin
+
+CMD [ "locatorctl" ]

Jenkinsfile

@@ -1,31 +1,33 @@
-// Copyright 2015 The Prometheus Authors
+// Copyright 2019 Iguazio
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// A minimal example of how to include Prometheus instrumentation.
 package main
 
 import (
 	"flag"
-	"log"
-	"net/http"
+	"fmt"
 
-	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/v3io/locator/pkg/locator"
 )
 
-var addr = flag.String("listen-address", ":8080", "The address to listen on for HTTP requests.")
-
 func main() {
+	config := &locator.Config{}
+	flag.IntVar(&config.Port, "port", 8080, "Listen port (default: 8080)")
+	flag.StringVar(&config.Namespace, "namespace", "", "Namespace to monitor")
 	flag.Parse()
-	http.Handle("/metrics", promhttp.Handler())
-	log.Fatal(http.ListenAndServe(*addr, nil))
+
+	if err := locator.RunServer(config); err != nil {
+		fmt.Println("Error while serving registry", err)
+	}
 }