Skip to content

Commit

Permalink
fixing medik8s.io forwarding
Browse files Browse the repository at this point in the history
Signed-off-by: razo7 <[email protected]>
  • Loading branch information
razo7 committed Feb 2, 2022
1 parent 224ba54 commit 608ecef
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 16 deletions.
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ GO_VERSION = 1.16
IMAGE_REGISTRY ?= quay.io/medik8s
export IMAGE_REGISTRY

# Workaround: medik8sCI postsubmit job uses OPERATOR_VERSION_NEXT, use it until updated to VERSION
ifneq ($(origin OPERATOR_VERSION_NEXT), undefined)
VERSION = $(OPERATOR_VERSION_NEXT)
endif

# When no version is set, use latest as image tags
DEFAULT_VERSION := 0.0.1
Expand Down Expand Up @@ -86,13 +82,13 @@ SHELL = /usr/bin/env bash -o pipefail

# Run go in a container
# --rm = remove container when stopped
# -v $$(pwd):/home/go/src/medik8s.io/node-maintenance-operator = bind mount current dir in container
# -v $$(pwd):/home/go/src/github.com/medik8s/node-maintenance-operator = bind mount current dir in container
# -u $$(id -u) = use current user (else new / modified files will be owned by root)
# -w /home/go/src/medik8s.io/node-maintenance-operator = working dir
# -w /home/go/src/github.com/medik8s/node-maintenance-operator = working dir
# -e ... = some env vars, especially set cache to a user writable dir
# --entrypoint /bin bash ... -c = run bash -c on start; that means the actual command(s) need be wrapped in double quotes, see e.g. check target which will run: bash -c "make test"
export DOCKER_GO=docker run --rm -v $$(pwd):/home/go/src/medik8s.io/node-maintenance-operator \
-u $$(id -u) -w /home/go/src/medik8s.io/node-maintenance-operator \
export DOCKER_GO=docker run --rm -v $$(pwd):/home/go/src/github.com/medik8s/node-maintenance-operator \
-u $$(id -u) -w /home/go/src/github.com/medik8s/node-maintenance-operator \
-e "GOPATH=/go" -e "GOFLAGS=-mod=vendor" -e "XDG_CACHE_HOME=/tmp/.cache" \
-e "VERSION=$(VERSION)" -e "IMAGE_REGISTRY=$(IMAGE_REGISTRY)" \
--entrypoint /bin/bash golang:$(GO_VERSION) -c
Expand Down
4 changes: 2 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: node-maintenance-operator
repo: medik8s.io/node-maintenance-operator
repo: github.com/medik8s/node-maintenance-operator
resources:
- api:
crdVersion: v1
Expand All @@ -14,7 +14,7 @@ resources:
domain: medik8s.io
group: nodemaintenance
kind: NodeMaintenance
path: medik8s.io/node-maintenance-operator/api/v1beta1
path: github.com/medik8s/node-maintenance-operator
version: v1beta1
webhooks:
validation: true
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ The phase is updated for each processing attempt on the CR.
For new minor releases:

- create and push the `release-0.y` branch.
- update medik8sCI and OpenshiftCI with new branches!

For every major / minor / patch release:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ spec:
type: AllNamespaces
keywords:
- medik8s
- Virtualization
- Node-maintenance
links:
- name: medik8s
url: https://medik8s.io
- name: Source Code
url: https://github.com/medik8s/node-maintenance-operator
maintainers:
- email: kni-lifecycle-team@redhat.com
name: Dragonfly Team
- email: medik8s@googlegroups.com
name: Medik8s Team
maturity: beta
provider:
name: Red Hat
name: medik8s
url: https://github.com/medik8s
version: 0.0.0
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module medik8s.io/node-maintenance-operator
module github.com/medik8s/node-maintenance-operator

go 1.16

Expand Down

0 comments on commit 608ecef

Please sign in to comment.