merge

Signed-off-by: Katrina Rogan <[email protected]>

.github/workflows/release-automation.yml

@@ -0,0 +1,41 @@
+name: Update flyteidl version
+on: 
+  workflow_dispatch:
+
+jobs:
+  update-flyte-releases:
+    name: Update Flyteidl version 
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: "0"
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - name: Update release
+        run: |
+          FLYTEIDL_VERSION=$(curl --silent "https://api.github.com/repos/flyteorg/flyteidl/releases/latest" | jq -r .tag_name)
+          go get -u github.com/flyteorg/flyteidl@$FLYTEIDL_VERSION
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.FLYTE_BOT_PAT }}
+          commit-message: Update Flyteidl version
+          committer: Flyte-Bot <[email protected]>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          signoff: true
+          branch: flyte-bot-update-flyteidl
+          delete-branch: true
+          title: 'Update Flyteidl version'
+          body: |
+            Update Flyteidl version
+            - Auto-generated by [flyte-bot]
+          labels: |
+            flyteidl
+          team-reviewers: |
+            owners
+            maintainers
+          draft: false

.goreleaser.yml

@@ -7,6 +7,9 @@ builds:
     env:
       - CGO_ENABLED=0
     main: ./cmd/main.go
+    ldflags:
+      - -s -w -X github.com/flyteorg/flytestdlib/version.Version={{.Version}} -X github.com/flyteorg/flytestdlib/version.Build={{.ShortCommit}} -X github.com/flyteorg/flytestdlib/version.BuildTime={{.Date}}
+
     binary: flyteadmin
     goos:
       - linux

Makefile

@@ -3,6 +3,13 @@ include boilerplate/lyft/docker_build/Makefile
 include boilerplate/lyft/golang_test_targets/Makefile
 include boilerplate/lyft/end2end/Makefile
 
+GIT_VERSION := $(shell git describe --always --tags)
+GIT_HASH := $(shell git rev-parse --short HEAD)
+TIMESTAMP := $(shell date '+%Y-%m-%d')
+PACKAGE ?=github.com/flyteorg/flytestdlib
+
+LD_FLAGS="-s -w -X $(PACKAGE)/version.Version=$(GIT_VERSION) -X $(PACKAGE)/version.Build=$(GIT_HASH) -X $(PACKAGE)/version.BuildTime=$(TIMESTAMP)"
+
 .PHONY: update_boilerplate
 update_boilerplate:
 	@boilerplate/update.sh
@@ -21,15 +28,15 @@ k8s_integration_execute:
 
 .PHONY: compile
 compile:
-	go build -o flyteadmin ./cmd/ && mv ./flyteadmin ${GOPATH}/bin
+	go build -o flyteadmin -ldflags=$(LD_FLAGS) ./cmd/ && mv ./flyteadmin ${GOPATH}/bin
 
 .PHONY: linux_compile
 linux_compile:
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /artifacts/flyteadmin ./cmd/
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0  go build -o /artifacts/flyteadmin -ldflags=$(LD_FLAGS) ./cmd/
 
 .PHONY: server
 server:
-	go run cmd/main.go serve --server.kube-config ~/.kube/config  --config flyteadmin_config.yaml
+	go run cmd/main.go serve  --server.kube-config ~/.kube/config  --config flyteadmin_config.yaml
 
 .PHONY: migrate
 migrate:

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/evanphx/json-patch v4.9.0+incompatible
-	github.com/flyteorg/flyteidl v0.18.26
+	github.com/flyteorg/flyteidl v0.18.32
 	github.com/flyteorg/flytepropeller v0.7.8
 	github.com/flyteorg/flytestdlib v0.3.15
 	github.com/gofrs/uuid v4.0.0+incompatible // indirect
@@ -40,7 +40,7 @@ require (
 	github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac // indirect
 	github.com/prometheus/client_golang v1.9.0
 	github.com/prometheus/common v0.19.0 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0

go.sum

@@ -260,6 +260,8 @@ github.com/flyteorg/flyteidl v0.18.24 h1:Y4+y/tu6Qsb3jNXxuVsflycfSocfthUi6XsMgJT
 github.com/flyteorg/flyteidl v0.18.24/go.mod h1:b5Fq4Z8a5b0mF6pEwTd48ufvikUGVkWSjZiMT0ZtqKI=
 github.com/flyteorg/flyteidl v0.18.26 h1:hcx/bR5EJSRfAmUmhjiEGHM22eC7APeXGT4MljR78EY=
 github.com/flyteorg/flyteidl v0.18.26/go.mod h1:b5Fq4Z8a5b0mF6pEwTd48ufvikUGVkWSjZiMT0ZtqKI=
+github.com/flyteorg/flyteidl v0.18.32 h1:Z+DeBh4i+mZK75lfJwmsHPf23nbsp2Qiv+kCnGMY9Ds=
+github.com/flyteorg/flyteidl v0.18.32/go.mod h1:b5Fq4Z8a5b0mF6pEwTd48ufvikUGVkWSjZiMT0ZtqKI=
 github.com/flyteorg/flyteplugins v0.5.38/go.mod h1:CxerBGWWEmNYmPxSMHnwQEr9cc1Fbo/g5fcABazU6Jo=
 github.com/flyteorg/flytepropeller v0.7.8 h1:O441kDHJUayS/2rebTj7VG4e1LowrweazQhzTaZ97m4=
 github.com/flyteorg/flytepropeller v0.7.8/go.mod h1:2SPJtYS0oM5lN4OCqBDbSRozRWvobFTXXlAC2ygbbWk=