From fea129d2e5d2ec2dd3aedb8d4009166336a1a34e Mon Sep 17 00:00:00 2001
From: piyuagr <piyuagr@iitk.ac.in>
Date: Wed, 18 Oct 2023 11:06:37 +0530
Subject: [PATCH 1/4] Moved Declaration of dynamic content from Makefile to
 .env file for Openstack

---
 Makefile | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 348a6e2e..73aee5c1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,17 +11,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
@@ -33,6 +23,7 @@ MACHINE_CONTROLLER_MANAGER_DEPLOYMENT_NAME := machine-controller-manager
 
 TOOLS_DIR := hack/tools
 include vendor/github.com/gardener/gardener/hack/tools.mk
+include .env
 
 #################################################
 # Rules for starting machine-controller locally

From ea5df11fcf55dd8386758e6222f945ccbbbf5c9c Mon Sep 17 00:00:00 2001
From: piyuagr <piyuagr@iitk.ac.in>
Date: Wed, 25 Oct 2023 15:35:31 +0530
Subject: [PATCH 2/4] Included .env in .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a8ce60a6..917b56ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 /tmp/*
 /dev
 /hack/tools/bin
-
+.env
 .vscode
 .idea
 *.DS_Store

From 237d2e830742bdcb62b39d58c0c1edab6e1cf816 Mon Sep 17 00:00:00 2001
From: piyuagr <piyuagr@iitk.ac.in>
Date: Wed, 25 Oct 2023 15:37:53 +0530
Subject: [PATCH 3/4] Updated Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 73aee5c1..a99f2867 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ MACHINE_CONTROLLER_MANAGER_DEPLOYMENT_NAME := machine-controller-manager
 
 TOOLS_DIR := hack/tools
 include vendor/github.com/gardener/gardener/hack/tools.mk
-include .env
+-include .env
 
 #################################################
 # Rules for starting machine-controller locally

From 7975222772b5e14758558fa0bd9fe885dad9af80 Mon Sep 17 00:00:00 2001
From: piyuagr <piyuagr@iitk.ac.in>
Date: Thu, 26 Oct 2023 10:04:21 +0530
Subject: [PATCH 4/4] Updated Makefile to move the include command at top.

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a99f2867..b47a31fb 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -22,8 +25,6 @@ MACHINE_CONTROLLER_MANAGER_DEPLOYMENT_NAME := machine-controller-manager
 #########################################
 
 TOOLS_DIR := hack/tools
-include vendor/github.com/gardener/gardener/hack/tools.mk
--include .env
 
 #################################################
 # Rules for starting machine-controller locally