From 608ecef0b8a5e84e5fa75e5e3d914788d123d662 Mon Sep 17 00:00:00 2001 From: razo7 Date: Wed, 2 Feb 2022 16:45:19 +0200 Subject: [PATCH] fixing medik8s.io forwarding Signed-off-by: razo7 --- Makefile | 12 ++++-------- PROJECT | 4 ++-- README.md | 1 - ...e-maintenance-operator.clusterserviceversion.yaml | 8 ++++---- go.mod | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index e20128f04..85174a87d 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 diff --git a/PROJECT b/PROJECT index 8d754eb41..61fe71b44 100644 --- a/PROJECT +++ b/PROJECT @@ -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 @@ -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 diff --git a/README.md b/README.md index a9d448722..465ec2fe3 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/config/manifests/bases/node-maintenance-operator.clusterserviceversion.yaml b/config/manifests/bases/node-maintenance-operator.clusterserviceversion.yaml index 9e68e0188..a680f30b7 100644 --- a/config/manifests/bases/node-maintenance-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/node-maintenance-operator.clusterserviceversion.yaml @@ -45,7 +45,6 @@ spec: type: AllNamespaces keywords: - medik8s - - Virtualization - Node-maintenance links: - name: medik8s @@ -53,9 +52,10 @@ spec: - 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 diff --git a/go.mod b/go.mod index fdfda8b2e..50309fee1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module medik8s.io/node-maintenance-operator +module github.com/medik8s/node-maintenance-operator go 1.16