Merge remote-tracking branch 'origin/develop' into stfahelm_openapi

.gitlab-ci.yml

@@ -10,10 +10,9 @@ stages:
   - analyze
   - apply
   - integration-test
-  - deploy
+  - build-release
   - .post
 
-
 include:
   - local: '/.gitlab/ci/.build-container.yml'
   - local: '/.gitlab/ci/.code-quality-ci.yml'
@@ -22,4 +21,4 @@ include:
   - local: '/.gitlab/ci/.containerlab-ci.yml'
   - local: '/.gitlab/ci/.integration-test.yml'
   - local: '/.gitlab/ci/.uml-autogen-ci.yml'
-#  - local: '/.gitlab/ci/.deploy-k8s.yml'
+  - local: '/.gitlab/ci/.build-release.yml'

.gitlab/ci/.build-container.yml

@@ -19,7 +19,7 @@ build-testing-image:
         TAG: latest
     - if: $CI_COMMIT_BRANCH == "develop"
       variables:
-        TAG: develop
+        TAG: $CI_COMMIT_BRANCH
         BUILDARGS: -race
     - when: always
   script:
@@ -40,7 +40,7 @@ build-image:
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       variables:
-        TAG: latest
+        TAG: $CI_DEFAULT_BRANCH
     - if: $CI_COMMIT_BRANCH == "develop"
       variables:
         TAG: develop
@@ -57,5 +57,3 @@ build-image:
       --destination "$GOSDN_IMAGE"
       --destination "$CI_REGISTRY_IMAGE:$TAG"
   <<: *build
-
-      #--build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/"

.gitlab/ci/.build-release.yml

+.build-release-docker: &build-release-docker
+  stage: build-release
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [ "" ]
+  rules:
+    # TODO: Implement later when we need it
+    #- if: $CI_COMMIT_TAG =~ .+ && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    #  variables:
+    #    TAG: $CI_COMMIT_TAG
+    #  when: on_success
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      variables:
+        TAG: $CI_DEFAULT_BRANCH
+      when: on_success
+    - when: never
+  before_script:
+      # replace all slashes in the tag with hyphen, because slashes are not allowed in tags
+    - TAG=${TAG//\//-}
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"username\":\"$CI_DEPENDENCY_PROXY_USER\",\"password\":\"$CI_DEPENDENCY_PROXY_TOKEN\"}}}" > /kaniko/.docker/config.json
+
+build-release-image:
+  script:
+    - /kaniko/executor
+      --cache=true
+      --context "$CI_PROJECT_DIR"
+      --dockerfile "Dockerfile"
+      --build-arg "GOLANG_VERSION=$GOLANG_VERSION"
+      --build-arg "BUILDARGS=$BUILDARGS"
+      --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/"
+      --destination "$GOSDN_IMAGE"
+      --destination "$CI_REGISTRY_IMAGE:$TAG"
+    - /kaniko/executor
+      --cache=true
+      --context "$CI_PROJECT_DIR"
+      --dockerfile "Dockerfile"
+      --build-arg "GOLANG_VERSION=$GOLANG_VERSION"
+      --build-arg "BUILDARGS=$BUILDARGS"
+      --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/"
+      --destination "$GOSDN_IMAGE"
+      --destination "$CI_REGISTRY_IMAGE:latest"
+  <<: *build-release-docker
+
+
+.build-release-binary: &build-release-binary
+  stage: build-release
+  image:
+    name: ${GITLAB_PROXY}golang:$GOLANG_VERSION
+  rules:
+    # TODO: Implement later when we need it
+    #- if: $CI_COMMIT_TAG =~ .+ && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    #  variables:
+    #    TAG: $CI_COMMIT_TAG
+    #  when: on_success
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      variables:
+        TAG: $CI_DEFAULT_BRANCH
+      when: on_success
+    - if: $CI_COMMIT_BRANCH == "develop"
+      variables:
+        TAG: $CI_COMMIT_BRANCH
+      when: on_success
+    - when: never
+
+build-release-linux:
+  script:
+    - GOOS=linux go build ./cmd/gosdn
+    - mv gosdn gosdn-$TAG
+    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file gosdn-$TAG "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gosdn/$TAG/gosdn-$TAG-linux"'
+  artifacts:
+    paths:
+      - gosdn-$TAG
+    expire_in: 4 weeks
+  <<: *build-release-binary
+
+build-release-freebsd:
+  script:
+    - GOOS=freebsd go build ./cmd/gosdn
+    - mv gosdn gosdn-$TAG
+    - - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file gosdn-$TAG "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gosdn/$TAG/gosdn-$TAG-freebsd"'
+  artifacts:
+    paths:
+      - gosdn-$TAG
+    expire_in: 4 weeks
+  <<: *build-release-binary
\ No newline at end of file

go.mod

 module code.fbi.h-da.de/danet/gosdn
 
-go 1.16
+go 1.17
 
 require (
 	code.fbi.h-da.de/danet/api v0.2.4
 	code.fbi.h-da.de/danet/forks/goarista v0.0.0-20210709163519-47ee8958ef40
 	code.fbi.h-da.de/danet/forks/google v0.0.0-20210709163519-47ee8958ef40
 	code.fbi.h-da.de/danet/yang-models v0.1.0
-	github.com/cpuguy83/go-md2man v1.0.8 // indirect
-	github.com/docker/docker v20.10.6+incompatible
-	github.com/gin-gonic/gin v1.7.4
-	github.com/go-delve/delve v1.7.3 // indirect
-	github.com/google/uuid v1.2.0
-	github.com/imdario/mergo v0.3.11 // indirect
-	github.com/openconfig/gnmi v0.0.0-20210707145734-c69a5df04b53
-	github.com/openconfig/goyang v0.2.7
-	github.com/openconfig/ygot v0.11.2
-	github.com/ramya-rao-a/go-outline v0.0.0-20210608161538-9736a4bde949 // indirect
-	github.com/russross/blackfriday v0.0.0-20180428102519-11635eb403ff // indirect
+	github.com/docker/docker v20.10.11+incompatible
+	github.com/google/uuid v1.1.2
+	github.com/openconfig/gnmi v0.0.0-20210914185457-51254b657b7d
+	github.com/openconfig/goyang v0.3.1
+	github.com/openconfig/ygot v0.12.5
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/afero v1.4.1 // indirect
-	github.com/spf13/cobra v1.1.3
-	github.com/spf13/viper v1.7.1
+	github.com/spf13/cobra v1.2.1
+	github.com/spf13/viper v1.9.0
 	github.com/stretchr/testify v1.7.0
-	github.com/uudashr/gopkgs/v2 v2.1.2 // indirect
-	golang.org/x/tools/gopls v0.7.3 // indirect
-	google.golang.org/grpc v1.39.0
+	google.golang.org/grpc v1.40.0
 	google.golang.org/protobuf v1.27.1
-	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
-	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
-	k8s.io/api v0.21.0
-	k8s.io/apimachinery v0.21.0
-	k8s.io/client-go v0.21.0
+	k8s.io/api v0.22.4
+	k8s.io/apimachinery v0.22.4
+	k8s.io/client-go v0.22.4
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/glog v1.0.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.11 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/mitchellh/mapstructure v1.4.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/spf13/afero v1.6.0 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/objx v0.2.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 // indirect
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
+	golang.org/x/sys v0.0.0-20211123173158-ef496fb156ab // indirect
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.64.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/klog/v2 v2.9.0 // indirect
+	k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )