Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-0.4] Change organisation name in Makefile #366

Merged
merged 1 commit into from
Jul 11, 2024
Merged

[release-0.4] Change organisation name in Makefile #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export KREW_ROOT := $(abspath $(TOOLS_BIN_DIR))
export PATH := $(KREW_ROOT)/bin:$(PATH)

# Set --output-base for conversion-gen if we are not within GOPATH
ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher-sandbox/cluster-api-provider-rke2)
ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher/cluster-api-provider-rke2)
CONVERSION_GEN_OUTPUT_BASE_CAPRKE2 := --output-base=$(ROOT_DIR)/$(CAPRKE2_DIR)
CONVERSION_GEN_OUTPUT_BASE_CAPBPR := --output-base=$(ROOT_DIR)/$(CAPBPR_DIR)
else
Expand Down Expand Up @@ -115,7 +115,7 @@ TAG ?= dev
ARCH ?= $(shell go env GOARCH)
ALL_ARCH = amd64 arm arm64 ppc64le s390x
REGISTRY ?= ghcr.io
ORG ?= rancher-sandbox
ORG ?= rancher
CONTROLLER_IMAGE_NAME := cluster-api-provider-rke2
BOOTSTRAP_IMAGE_NAME := $(CONTROLLER_IMAGE_NAME)-bootstrap
CONTROLPLANE_IMAGE_NAME = $(CONTROLLER_IMAGE_NAME)-controlplane
Expand Down Expand Up @@ -500,7 +500,7 @@ release-manifests: $(RELEASE_DIR) $(KUSTOMIZE) ## Build the manifests to publish
.PHONY: release-notes
release-notes: $(RELEASE_DIR) $(GH)
if [ -n "${PRE_RELEASE}" ]; then \
echo ":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/rancher-sandbox/cluster-api-provider-rke2/issues/new)." > $(RELEASE_DIR)/CHANGELOG.md; \
echo ":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/rancher/cluster-api-provider-rke2/issues/new)." > $(RELEASE_DIR)/CHANGELOG.md; \
else \
$(GH) api repos/$(ORG)/$(GH_REPO_NAME)/releases/generate-notes -F tag_name=$(VERSION) -F previous_tag_name=$(PREVIOUS_VERSION) --jq '.body' > $(RELEASE_DIR)/CHANGELOG.md; \
fi
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/config/default/manager_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ spec:
template:
spec:
containers:
- image: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:dev
- image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev
name: manager
2 changes: 1 addition & 1 deletion controlplane/config/default/manager_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ spec:
template:
spec:
containers:
- image: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:dev
- image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:dev
name: manager
4 changes: 2 additions & 2 deletions test/e2e/config/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ images:
loadBehavior: tryLoad
- name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:v0.4.0
loadBehavior: tryLoad
- name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:dev
- name: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev
loadBehavior: mustLoad
- name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:dev
- name: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:dev
loadBehavior: mustLoad
- name: quay.io/jetstack/cert-manager-cainjector:v1.14.4
loadBehavior: tryLoad
Expand Down
4 changes: 2 additions & 2 deletions tilt-provider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "rke2-control-plane",
"config": {
"context": "controlplane",
"image": "ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:dev",
"image": "ghcr.io/rancher/cluster-api-provider-rke2-controlplane:dev",
"live_reload_deps": [
"main.go",
"go.mod",
Expand All @@ -21,7 +21,7 @@
"name": "rke2-bootstrap",
"config": {
"context": "bootstrap",
"image": "ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:dev",
"image": "ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev",
"live_reload_deps": [
"main.go",
"go.mod",
Expand Down
Loading