Skip to content

Commit

Permalink
Moved Declaration of dynamic content from Makefile to .env file for O…
Browse files Browse the repository at this point in the history
…PENSTACK (#102)

* Moved Declaration of dynamic content from Makefile to .env file for Openstack

* Included .env in .gitignore

* Updated Makefile

* Updated Makefile to move the include command at top.
  • Loading branch information
piyuagr authored Oct 26, 2023
1 parent 020a056 commit 7d75817
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
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

0 comments on commit 7d75817

Please sign in to comment.