Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.
Open
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ e2e-run:
-f Dockerfile-e2e \
-t e2e-test .
docker run --rm --network host \
-e METALCTL_URL \
-e METALCTL_API_URL \
-e METALCTL_HMAC \
-e IMAGE_TAG \
--name e2e-test e2e-test
Expand Down Expand Up @@ -294,7 +294,7 @@ crds: controller-gen
output:crd:artifacts:config=config/resources/crd/bases \
output:rbac:dir=config/resources/rbac \
rbac:roleName=manager-role \
webhook
webhook

# Run go fmt against code
fmt:
Expand Down
4 changes: 2 additions & 2 deletions config/test/patch_manager_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ spec:
- args:
- --enable-leader-election=false
env:
- name: METALCTL_URL
value: ${METALCTL_URL}
- name: METALCTL_API_URL
value: ${METALCTL_API_URL}
- name: METALCTL_HMAC
value: ${METALCTL_HMAC}
envFrom: []
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -52,7 +52,7 @@ func main() {
ctrl.SetLogger(zap.New(zap.UseDevMode(true)))

// Create the `metal-API` client.
metalClient, err := metalgo.NewDriver(os.Getenv("METALCTL_URL"), "", os.Getenv("METALCTL_HMAC"))
metalClient, err := metalgo.NewDriver(os.Getenv("METALCTL_API_URL"), "", os.Getenv("METALCTL_HMAC"))
if err != nil {
setupLog.Error(err, "unable to get `metal-stack/metal-go`client")
os.Exit(1)
Expand Down
6 changes: 3 additions & 3 deletions scripts/run-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ FACILITY=PARTITION

METALSTACK_IMAGE="${BUILD_IMAGE}:${IMAGE_TAG}"

METALCTL_URL=http://metal-api.metal-control-plane:8080/metal
METALCTL_API_URL=http://metal-api.metal-control-plane:8080/metal
METALCTL_HMAC=metal-admin

export PROJECT_ID PARTITION NETWORK_ID NODE_IMAGE CONTROL_PLANE_IP WORKER_NODE_TYPE MASTER_NODE_TYPE
export PROJECT_ID PARTITION NETWORK_ID NODE_IMAGE CONTROL_PLANE_IP WORKER_NODE_TYPE MASTER_NODE_TYPE
export POD_CIDR SERVICE_CIDR SSH_KEY USE_EXISTING_CLUSTER KUBERNETES_VERSION NODE_OS FACILITY
export METALSTACK_IMAGE METALCTL_URL METALCTL_HMAC
export METALSTACK_IMAGE METALCTL_API_URL METALCTL_HMAC
make e2e-test