Skip to content

Commit 884c809

Browse files
authored
Merge pull request #2307 from prankul88/remove-duplicate-code
🐛 Remove variables from ci that are already declared in Makefile
2 parents 4d89d56 + b7dbe52 commit 884c809

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

scripts/ci-integration.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ CONTROLLER_REPO_KUBEADM_BOOTSTRAP="controller-ci-kubeadm-bootstrap"
3333
CONTROLLER_REPO_KUBEADM_CONTROL_PLANE="controller-ci-kubeadm-control-plane"
3434
EXAMPLE_PROVIDER_REPO="example-provider-ci"
3535
CERT_MANAGER_URL="https://github.com/jetstack/cert-manager/releases/download/v0.11.0/cert-manager.yaml"
36-
TOOLS_DIR="hack/tools"
37-
TOOLS_BIN_DIR="${TOOLS_DIR}/bin"
3836

3937
GOOS=$(go env GOOS)
4038
GOARCH=$(go env GOARCH)
@@ -59,12 +57,6 @@ install_kustomize() {
5957

6058
build_containers() {
6159
VERSION="$(git describe --exact-match 2> /dev/null || git describe --match="$(git rev-parse --short=8 HEAD)" --always --dirty --abbrev=8)"
62-
export CONTROLLER_GEN="${PWD}/${TOOLS_BIN_DIR}/controller-gen"
63-
export CONVERSION_GEN="${PWD}/${TOOLS_BIN_DIR}/conversion-gen"
64-
export KUSTOMIZE="${PWD}/${TOOLS_BIN_DIR}/kustomize"
65-
export GOBINDATA="${PWD}/${TOOLS_BIN_DIR}/go-bindata"
66-
export GOBINDATA_CLUSTERCTL_DIR="cmd/clusterctl/config"
67-
export CERTMANAGER_COMPONENTS_GENERATED_FILE="cert-manager.yaml"
6860
export CONTROLLER_IMG="${CONTROLLER_REPO}"
6961
export KUBEADM_BOOTSTRAP_CONTROLLER_IMG="${CONTROLLER_REPO_KUBEADM_BOOTSTRAP}"
7062
export KUBEADM_CONTROL_PLANE_CONTROLLER_IMG="${CONTROLLER_REPO_KUBEADM_CONTROL_PLANE}"

0 commit comments

Comments
 (0)