Skip to content

Commit

Permalink
fix: use canonical image url & remove CPU limits
Browse files Browse the repository at this point in the history
  • Loading branch information
matskiv committed May 5, 2022
1 parent 6317181 commit 4ed4be7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

TAG ?= main
# Image URL to use all building/pushing image targets
IMG ?= loftsh/cluster-api-provider-vcluster:$(TAG)
IMG ?= docker.io/loftsh/cluster-api-provider-vcluster:$(TAG)
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.23

Expand Down Expand Up @@ -140,6 +140,6 @@ release: manifests kustomize ## Builds the manifests to publish with a release.
cp templates/cluster-template* $(RELEASE_DIR)/
cp metadata.yaml $(RELEASE_DIR)/metadata.yaml
# revert the values back to development ones
sed -i'' -e 's@image: .*@image: loftsh/cluster-api-provider-vcluster:main@' ./config/default/manager_image_patch.yaml
sed -i'' -e 's@image: .*@image: docker.io/loftsh/cluster-api-provider-vcluster:main@' ./config/default/manager_image_patch.yaml
sed -i'' -e 's@imagePullPolicy: '"$(PULL_POLICY)"'@imagePullPolicy: IfNotPresent@' ./config/default/manager_pull_policy_patch.yaml
sed -i'' -e 's@name: $${CLUSTER_ROLE:=cluster-admin}@name: cluster-admin@' ./config/rbac/provider_role_binding.yaml
3 changes: 1 addition & 2 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
- /manager
args:
- --leader-elect
image: loftsh/cluster-api-provider-vcluster
image: docker.io/loftsh/cluster-api-provider-vcluster
imagePullPolicy: IfNotPresent
name: manager
securityContext:
Expand All @@ -53,7 +53,6 @@ spec:
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
limits:
cpu: 500m
memory: 1Gi
requests:
cpu: 10m
Expand Down

0 comments on commit 4ed4be7

Please sign in to comment.