v1.0.0-alpha.0

hivelocity · May 16, 2023 · 94a5c22 · 94a5c22
1 parent d06c965
commit 94a5c22
Show file tree

Hide file tree

Showing 7 changed files with 1,478 additions and 15 deletions.
diff --git a/.github/actions/e2e/action.yaml b/.github/actions/e2e/action.yaml
@@ -55,7 +55,7 @@ runs:
         HIVELOCITY_API_KEY: ${{ env.HIVELOCITY_API_KEY }}
         HIVELOCITY_SSH_PUB: ${{ inputs.e2e_ssh_pub }}
         SKIP_IMAGE_BUILD: "1"
-        CAPHV_LATEST_VERSION: "latest" # TODO: use real version
+        CAPHV_LATEST_VERSION: "v1.0.0-alpha.0"
       run: make ${{ inputs.e2e_make_target }}
     - name: Upload artifact
       uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3

diff --git a/Makefile b/Makefile
@@ -155,6 +155,10 @@ generate-manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole
 generate-go-deepcopy: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="./hack/boilerplate/boilerplate.generatego.txt" paths="./api/..."
 
+
+cluster-templates: $(KUSTOMIZE)
+	$(KUSTOMIZE) build templates/cluster-templates/hivelocity --load-restrictor LoadRestrictionsNone  > templates/cluster-templates/cluster-template.yaml
+
 dry-run: generate
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${STAGING_REGISTRY}:${TAG}
 	mkdir -p dry-run
@@ -310,6 +314,8 @@ e2e-image: ## Build the e2e manager image
 .PHONY: $(E2E_CONF_FILE)
 e2e-conf-file: $(E2E_CONF_FILE)
 $(E2E_CONF_FILE): $(ENVSUBST) $(E2E_CONF_FILE_SOURCE)
+	@test $${MANIFEST_PATH?Environment variable is required}
+	@test $${CAPHV_LATEST_VERSION?Environment variable is required}
 	mkdir -p $(shell dirname $(E2E_CONF_FILE))
 	$(ENVSUBST) < $(E2E_CONF_FILE_SOURCE) > $(E2E_CONF_FILE)
 

diff --git a/test/e2e/config/hivelocity-ci-envsubst.yaml b/test/e2e/config/hivelocity-ci-envsubst.yaml
@@ -18,7 +18,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -35,7 +35,7 @@ providers:
         type: "url"
         contract: "v1beta1"
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -51,7 +51,7 @@ providers:
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/control-plane-components.yaml"
         type: "url"
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -63,12 +63,12 @@ providers:
   - name: hivelocity
     type: InfrastructureProvider
     versions:
-      - name:  # latest published release
-        value: https://github.com/hivelocity/cluster-api-provider-hivelocity/releases/download//infrastructure-components.yaml
+      - name: v1.0.0-alpha.0 # latest published release
+        value: https://github.com/hivelocity/cluster-api-provider-hivelocity/releases/download/v1.0.0-alpha.0/infrastructure-components.yaml
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../metadata.yaml"
+          - sourcePath: "../../../out/metadata.yaml"
           - sourcePath: "../data/infrastructure-hivelocity/v1alpha1/cluster-template.yaml"
       - name: v1.0.99 # next; use manifest from source files
         value: ../../../config/default
@@ -81,7 +81,7 @@ providers:
           - old: --metrics-bind-addr=localhost:8080
             new: --metrics-bind-addr=:8080
         files:
-          - sourcePath: "../metadata.yaml"
+          - sourcePath: "../../../out/metadata.yaml"
           - sourcePath: "../data/infrastructure-hivelocity/v1alpha1/cluster-template.yaml"
 
 variables:
@@ -103,7 +103,7 @@ variables:
   INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/clusterctl-linux-amd64"
   INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
   INIT_WITH_KUBERNETES_VERSION: "v1.25.2"
-  INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION:
+  INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: v1.0.0-alpha.0
 
   # Cluster Addons
   CILIUM: "./data/cni/cilium/cilium.yaml"

diff --git a/test/e2e/config/hivelocity-ci.yaml b/test/e2e/config/hivelocity-ci.yaml
@@ -18,7 +18,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -35,7 +35,7 @@ providers:
         type: "url"
         contract: "v1beta1"
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -51,7 +51,7 @@ providers:
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/control-plane-components.yaml"
         type: "url"
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"

diff --git a/test/e2e/config/hivelocity.yaml b/test/e2e/config/hivelocity.yaml
@@ -18,7 +18,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -35,7 +35,7 @@ providers:
         type: "url"
         contract: "v1beta1"
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -51,7 +51,7 @@ providers:
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/control-plane-components.yaml"
         type: "url"
         files:
-          - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1alpha1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"