Merge pull request #8 from d2iq-labs/jimmi/more-caren-renames

Author: jimmidyson

.gitignore

@@ -40,4 +40,4 @@ node_modules/
 /cluster.yaml
 /runtime-extension-components.yaml
 /_artifacts/
-test/e2e/config/cre-envsubst.yaml
+test/e2e/config/caren-envsubst.yaml

make/go.mk

@@ -74,8 +74,8 @@ bench.%: ; $(info $(M) running benchmarks$(if $(GOTEST_RUN), matching "$(GOTEST_
 
 E2E_PARALLEL_NODES ?= $(shell nproc --ignore=1)
 E2E_FLAKE_ATTEMPTS ?= 1
-E2E_CONF_FILE ?= $(REPO_ROOT)/test/e2e/config/cre.yaml
-E2E_CONF_FILE_ENVSUBST ?= $(REPO_ROOT)/test/e2e/config/cre-envsubst.yaml
+E2E_CONF_FILE ?= $(REPO_ROOT)/test/e2e/config/caren.yaml
+E2E_CONF_FILE_ENVSUBST ?= $(basename $(E2E_CONF_FILE))-envsubst.yaml
 ARTIFACTS ?= ${REPO_ROOT}/_artifacts
 
 .PHONY: e2e-test

metadata.yaml

@@ -16,3 +16,6 @@ releaseSeries:
 - major: 0
   minor: 5
   contract: v1beta1
+- major: 0
+  minor: 6
+  contract: v1beta1

test/e2e/config/cre.yaml renamed to test/e2e/config/caren.yaml

@@ -1,7 +1,7 @@
 # Copyright 2024 D2iQ, Inc. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-managementClusterName: cre-e2e
+managementClusterName: caren-e2e
 
 images:
   - name: ko.local/cluster-api-runtime-extensions-nutanix:${E2E_IMAGE_TAG}
@@ -101,12 +101,12 @@ providers:
     type: "url"
     contract: v1beta1
     files:
-    - sourcePath: "../data/shared/v1beta1-helm/metadata.yaml"
+    - sourcePath: "../data/shared/v1beta1-caaph/metadata.yaml"
     replacements:
     - old: --metrics-addr=127.0.0.1:8080
       new: --metrics-addr=:8080
 
-- name: cre
+- name: caren
   type: RuntimeExtensionProvider
   versions:
   - name: "{go://github.com/d2iq-labs/[email protected]}"
@@ -125,7 +125,7 @@ providers:
     type: "url"
     contract: v1beta1
     files:
-    - sourcePath: "../data/shared/v1beta1-cre/metadata.yaml"
+    - sourcePath: "../data/shared/v1beta1-caren/metadata.yaml"
     replacements:
     - old: "--v=0"
       new: "--v=8"

test/e2e/data/shared/v1beta1-helm/metadata.yaml renamed to test/e2e/data/shared/v1beta1-caaph/metadata.yaml

@@ -75,7 +75,7 @@ func init() { //nolint:gochecknoinits // Idiomatically used to set up flags.
 func TestE2E(t *testing.T) {
 	ctrl.SetLogger(klog.Background())
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "cre-e2e")
+	RunSpecs(t, "caren-e2e")
 }
 
 // Using a SynchronizedBeforeSuite for controlling how to create resources shared across ParallelNodes (~ginkgo
@@ -238,7 +238,7 @@ func setupBootstrapCluster(
 	} else {
 		// Loading image for already created cluster
 		imagesInput := capibootstrap.LoadImagesToKindClusterInput{
-			Name:   "cre-e2e",
+			Name:   "caren-e2e",
 			Images: config.Images,
 		}
 		err := capibootstrap.LoadImagesToKindCluster(context.TODO(), imagesInput)