Skip to content

Commit

Permalink
release should include repo name
Browse files Browse the repository at this point in the history
Signed-off-by: Nir Rozenbaum <[email protected]>
  • Loading branch information
nirrozenbaum committed Feb 18, 2024
1 parent 78d3647 commit 63a4bdc
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
18 changes: 11 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
# limitations under the License.

# Image repo/tag to use all building/pushing image targets
DOCKER_REGISTRY ?= ghcr.io/kubestellar
IMAGE_TAG ?= 0.20.0-alpha.1
CMD_NAME ?= ocm-transport-plugin
DOCKER_REGISTRY ?= ghcr.io/kubestellar/ocm-transport-plugin
IMAGE_TAG ?= 0.1.0.rc1
CMD_NAME ?= transport-controller
IMAGE ?= ${DOCKER_REGISTRY}/${CMD_NAME}:${IMAGE_TAG}

ARCH := $(shell go env GOARCH)

.PHONY: build
build: ## Builds OCM based transport executable.
go build -o bin/ocm-transport-plugin ./cmd/ocm-transport-plugin/main.go
build: vet fmt modules ## Builds OCM based transport executable.
go build -o bin/ocm-transport-plugin ./cmd/${CMD_NAME}/main.go

.PHONY: fmt
fmt: ## Run go fmt against code.
Expand All @@ -32,9 +32,13 @@ fmt: ## Run go fmt against code.
vet: ## Run go vet against code.
go vet ./...

.PHONY: modules
modules: ## Run go tidy against code.
go mod tidy

.PHONY: ko-build-local
ko-build-local: vet fmt ## Build local container image with `ko`
KO_DOCKER_REPO=ko.local ko build --push=false -B ./cmd/${CMD_NAME} -t ${IMAGE_TAG} --platform linux/${ARCH}
ko-build-local: vet fmt modules ## Build local container image with `ko`.
$(shell (docker version | { ! grep -qi podman; } ) || echo "DOCKER_HOST=unix://$$HOME/.local/share/containers/podman/machine/qemu/podman.sock ") KO_DOCKER_REPO=ko.local ko build -B ./cmd/${CMD_NAME} -t ${IMAGE_TAG} --platform linux/${ARCH}
docker tag ko.local/${CMD_NAME}:${IMAGE_TAG} ${IMAGE}

.PHONY: help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ limitations under the License.
package main

import (
cmd "github.com/kubestellar/kubestellar/cmd/transport"
"github.com/kubestellar/kubestellar/pkg/transport/cmd"
ocm "github.com/kubestellar/ocm-transport-plugin/pkg"
)

func main() {
cmd.Run(ocm.NewOCMTransport())
cmd.GenericMain(ocm.NewOCMTransport())
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/kubestellar/ocm-transport-plugin
go 1.20

require (
github.com/kubestellar/kubestellar v0.20.0-alpha.1.last-before-renaming.0.20240214171438-43e5c812bb54
github.com/kubestellar/kubestellar v0.20.0-alpha.1.last-before-renaming.0.20240217222541-c1d34372394f
k8s.io/apimachinery v0.28.2
open-cluster-management.io/api v0.12.0
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kubestellar/kubestellar v0.20.0-alpha.1.last-before-renaming.0.20240214171438-43e5c812bb54 h1:Tb3i9NB6vkSDF4TMiO3nDJEn03k7h4IBILWL4khZcZ8=
github.com/kubestellar/kubestellar v0.20.0-alpha.1.last-before-renaming.0.20240214171438-43e5c812bb54/go.mod h1:g4PURCRviMUnP0QIM8M0AXI/yZBI+dWU8O8nnCe7uoQ=
github.com/kubestellar/kubestellar v0.20.0-alpha.1.last-before-renaming.0.20240217222541-c1d34372394f h1:ICkwec7YBuKpBE7y6ATn0gkUAMkBKTZRLR1zqmcHf6o=
github.com/kubestellar/kubestellar v0.20.0-alpha.1.last-before-renaming.0.20240217222541-c1d34372394f/go.mod h1:g4PURCRviMUnP0QIM8M0AXI/yZBI+dWU8O8nnCe7uoQ=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand Down

0 comments on commit 63a4bdc

Please sign in to comment.