Skip to content

Commit

Permalink
Generate vm-operator YAML instead of downloading it from GCS
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Büringer [email protected]
  • Loading branch information
sbueringer committed Apr 23, 2024
1 parent d4a5e72 commit fee0cd0
Show file tree
Hide file tree
Showing 3 changed files with 8,703 additions and 8 deletions.
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ set-manifest-image:
##@ vm-operator:

.PHONY: release-vm-operator
release-vm-operator: docker-vm-operator-build-all vm-operator-manifest-build docker-vm-operator-push-all vm-operator-manifest-push ## Build and push the vm-operator image and manifest for usage in CI
release-vm-operator: docker-vm-operator-build-all vm-operator-manifest-build docker-vm-operator-push-all ## Build and push the vm-operator image and manifest for usage in CI

.PHONY: vm-operator-checkout
vm-operator-checkout:
Expand All @@ -811,13 +811,8 @@ vm-operator-checkout:
vm-operator-manifest-build: $(RELEASE_DIR) $(KUSTOMIZE) vm-operator-checkout ## Build the vm-operator manifest yaml file
kustomize build --load-restrictor LoadRestrictionsNone "$(VM_OPERATOR_TMP_DIR)/config/local" > "$(VM_OPERATOR_DIR)/vm-operator.yaml"
sed -i'' -e 's@image: vmoperator.*@image: '"$(VM_OPERATOR_CONTROLLER_IMG):$(VM_OPERATOR_VERSION)"'@' "$(VM_OPERATOR_DIR)/vm-operator.yaml"
kustomize build "$(VM_OPERATOR_DIR)" > "$(RELEASE_DIR)/vm-operator-$(VM_OPERATOR_VERSION).yaml"
kustomize build "$(VM_OPERATOR_DIR)" > "$(VM_OPERATOR_DIR)/vm-operator-$(VM_OPERATOR_VERSION).yaml"

.PHONY: vm-operator-manifest-push
vm-operator-manifest-push: ## Push the vm-operator manifest yaml file to gcs
gsutil cp \
"$(RELEASE_DIR)/vm-operator-$(VM_OPERATOR_VERSION).yaml" \
"gs://artifacts.k8s-staging-capi-vsphere.appspot.com/vm-operator/$(VM_OPERATOR_VERSION).yaml"

.PHONY: docker-vm-operator-build-all
docker-vm-operator-build-all: $(addprefix docker-vm-operator-build-,$(VM_OPERATOR_ALL_ARCH)) ## Build docker images for all architectures
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/config/vsphere.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ providers:
versions:
- name: v1.8.6-0-gde75746a
# Use manifest from source files
value: "https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/vm-operator/v1.8.6-0-gde75746a.yaml"
value: "file://../../../../cluster-api-provider-vsphere/test/infrastructure/vm-operator/vm-operator-v1.8.6-0-gde75746a.yaml"
type: "url"
contract: v1beta1
files:
Expand Down
Loading

0 comments on commit fee0cd0

Please sign in to comment.