Merge branch 'develop' of github.com:eclipse-iofog/iofog-operator

Author: baghbidi

.gitignore

@@ -78,4 +78,4 @@ tags
 
 /vendor/
 /.idea/*
-
+/bin/

.travis.yml

@@ -0,0 +1,12 @@
+FROM golang:1.12-alpine as backend
+
+COPY . /go/src/github.com/eclipse-iofog/iofog-operator
+WORKDIR /go/src/github.com/eclipse-iofog/iofog-operator
+RUN apk add --update --no-cache bash curl git make && \
+    make vendor && \
+    make build
+
+FROM alpine:3.7
+COPY --from=backend /go/src/github.com/eclipse-iofog/iofog-operator/bin /bin
+
+ENTRYPOINT ["/bin/iofog-operator"]

Dockerfile

@@ -46,8 +46,8 @@ required = [
 [[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  branch = "master" #osdk_branch_annotation
-  # version = "=v0.3.0" #osdk_version_annotation
+  # branch = "master" #osdk_branch_annotation
+  version = "=v0.8.0" #osdk_version_annotation
 
 [prune]
   go-tests = true

Gopkg.lock

@@ -2,10 +2,9 @@ SHELL = /bin/bash
 OS = $(shell uname -s)
 
 # Project variables
-PACKAGE = github.com/iofog/iofog-operator
+PACKAGE = github.com/eclipse-iofog/iofog-operator
 BINARY_NAME = iofog-operator
 IMAGE = iofog/iofog-operator
-TAG ?= dev
 
 # Build variables
 BUILD_DIR ?= bin
@@ -24,7 +23,10 @@ DEP_VERSION = 0.5.0
 GOLANG_VERSION = 1.11
 GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./client/*")
 
-# Golang build targets
+BRANCH ?= $(TRAVIS_BRANCH)
+RELEASE_TAG ?= 0.0.0
+
+
 .PHONY: clean
 clean: ## Clean the working area and the project
 	rm -rf $(BUILD_DIR)/ vendor/
@@ -42,12 +44,37 @@ vendor: bin/dep ## Install dependencies
 
 .PHONY: build
 build: GOARGS += -tags "$(GOTAGS)" -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)
-build: ## Build a binary
+build:
 ifneq ($(IGNORE_GOLANG_VERSION_REQ), 1)
 	@printf "$(GOLANG_VERSION)\n$$(go version | awk '{sub(/^go/, "", $$3);print $$3}')" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -g | head -1 | grep -q -E "^$(GOLANG_VERSION)$$" || (printf "Required Go version is $(GOLANG_VERSION)\nInstalled: `go version`" && exit 1)
 endif
 	go build $(GOARGS) $(BUILD_PACKAGE)
 
+.PHONY: build-img
+build-img:
+	docker build --rm -t $(IMAGE):latest -f Dockerfile .
+
+.PHONY: push-img
+push-img:
+	@echo $(DOCKER_PASS) | docker login -u $(DOCKER_USER) --password-stdin
+ifeq ($(BRANCH), master)
+	# Master branch
+	docker push $(IMAGE):latest
+	docker tag $(IMAGE):latest $(IMAGE):$(RELEASE_TAG)
+	docker push $(IMAGE):$(RELEASE_TAG)
+endif
+ifneq (,$(findstring release,$(BRANCH)))
+	# Release branch
+	docker tag $(IMAGE):latest $(IMAGE):rc-$(RELEASE_TAG)
+	docker push $(IMAGE):rc-$(RELEASE_TAG)
+else
+	# Develop and feature branches
+	docker tag $(IMAGE):latest $(IMAGE)-$(BRANCH):latest
+	docker push $(IMAGE)-$(BRANCH):latest
+	docker tag $(IMAGE):latest $(IMAGE)-$(BRANCH):$(COMMIT_HASH)
+	docker push $(IMAGE)-$(BRANCH):$(COMMIT_HASH)
+endif
+
 .PHONY: fmt
 fmt:
 	@gofmt -s -w $(GOFILES_NOVENDOR)

Gopkg.toml

@@ -0,0 +1,48 @@
+trigger:
+  tags:
+    include:
+      - v.*
+  branches:
+    include:
+      - develop
+      - release*
+  paths:
+    exclude:
+      - README.md
+
+variables:
+  repository: 'focal-freedom-236620/operator'
+  primaryTag: $(Build.SourceBranchName)
+
+jobs:
+  - job: Operator
+    pool:
+      vmImage: 'Ubuntu-16.04'
+
+    steps:
+      - script: |
+          echo 'setting secondary tag'
+          echo "##vso[task.setvariable variable=secondaryTag]b-$(Build.BuildId)"
+
+          if [[ $(Build.SourceBranch) == refs/heads/release* ]]; then
+            echo "##vso[task.setvariable variable=primaryTag]rc-$(Build.SourceBranchName)"
+          #If branch starts with ref/tags, apply latest and version tag
+          elif [[ $(Build.SourceBranch) == refs/tags* ]]; then
+            primaryTag= echo $(primaryTag) | awk '{print substr($1,2);}'
+            echo $primaryTag
+            echo "##vso[task.setvariable variable=primaryTag]$primaryTag"
+            echo "##vso[task.setvariable variable=secondaryTag]latest"
+          fi
+        displayName: 'Set Tag variable'
+        name: setvarStep
+
+      - task: Docker@2
+        displayName: 'build docker'
+        inputs:
+          containerRegistry: 'Edgeworx GCP'
+          repository: $(repository)
+          command: 'buildAndPush'
+          Dockerfile: 'Dockerfile'
+          tags: |
+            $(primaryTag)
+            $(secondaryTag)

Makefile

@@ -7,8 +7,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/iofog/iofog-operator/pkg/apis"
-	"github.com/iofog/iofog-operator/pkg/controller"
+	"github.com/eclipse-iofog/iofog-operator/pkg/apis"
+	"github.com/eclipse-iofog/iofog-operator/pkg/controller"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	"github.com/operator-framework/operator-sdk/pkg/leader"
 	"github.com/operator-framework/operator-sdk/pkg/ready"

azure-pipelines.yml

@@ -0,0 +1,6 @@
+kubectl create -f deploy/service_account.yaml
+kubectl create -f deploy/role.yaml
+kubectl create -f deploy/role_binding.yaml
+kubectl create -f deploy/namespace.yaml
+kubectl create -f deploy/crds/k8s_v1alpha1_iofog_crd.yaml
+