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.

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

Moved Declaration of dynamic content from Makefile to .env file for OPENSTACK #102

Merged
merged 4 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/tmp/*
/dev
/hack/tools/bin

.env
.vscode
.idea
*.DS_Store
Expand Down
16 changes: 4 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#
# SPDX-License-Identifier: Apache-2.0

include vendor/github.com/gardener/gardener/hack/tools.mk
-include .env

BINARY_PATH := bin/
REPO_ROOT := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
HACK_DIR := $(REPO_ROOT)/hack
Expand All @@ -11,17 +14,7 @@ IMAGE_PREFIX := $(REGISTRY)/extensions
NAME := machine-controller-manager-provider-openstack
IMAGE_NAME := $(IMAGE_PREFIX)/$(NAME)
VERSION := $(shell cat VERSION)
CONTROL_NAMESPACE := default
CONTROL_KUBECONFIG ?= dev/control-kubeconfig.yaml
TARGET_KUBECONFIG ?= dev/target-kubeconfig.yaml

# Below ones are used in tests
MACHINECLASS_V1 := dev/machineclassv1.yaml
MACHINECLASS_V2 :=
MCM_IMAGE :=
MC_IMAGE :=
# MCM_IMAGE := eu.gcr.io/gardener-project/gardener/machine-controller-manager:v0.42.0
# MC_IMAGE := $(IMAGE_NAME):v0.6.0

LEADER_ELECT := "true"
# If Integration Test Suite is to be run locally against clusters then export the below variable
# with MCM deployment name in the cluster
Expand All @@ -32,7 +25,6 @@ MACHINE_CONTROLLER_MANAGER_DEPLOYMENT_NAME := machine-controller-manager
#########################################

TOOLS_DIR := hack/tools
include vendor/github.com/gardener/gardener/hack/tools.mk

#################################################
# Rules for starting machine-controller locally
Expand Down