Skip to content

Commit

Permalink
fix helm (#83)
Browse files Browse the repository at this point in the history
Signed-off-by: raffaelespazzoli <[email protected]>
  • Loading branch information
raffaelespazzoli authored Dec 2, 2021
1 parent 3fd7df3 commit 55b57e3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ helmchart: kustomize
mkdir -p ./charts/${OPERATOR_NAME}/templates
mkdir -p ./charts/${OPERATOR_NAME}/crds
cp ./config/helmchart/templates/* ./charts/${OPERATOR_NAME}/templates
$(KUSTOMIZE) build ./config/helmchart | sed 's/release-namespace/{{.Release.Namespace}}/' > ./charts/${OPERATOR_NAME}/templates/rbac.yaml
$(KUSTOMIZE) build ./config/helmchart | sed 's/namespace: system/namespace: {{ .Release.Namespace }}/' > ./charts/${OPERATOR_NAME}/templates/rbac.yaml
if [ -d "./config/crd" ]; then $(KUSTOMIZE) build ./config/crd > ./charts/${OPERATOR_NAME}/crds/crds.yaml; fi
version=${VERSION} envsubst < ./config/helmchart/Chart.yaml.tpl > ./charts/${OPERATOR_NAME}/Chart.yaml
version=${VERSION} image_repo=$${IMG%:*} envsubst < ./config/helmchart/values.yaml.tpl > ./charts/${OPERATOR_NAME}/values.yaml
Expand Down
5 changes: 4 additions & 1 deletion config/helmchart/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Adds namespace to all resources.
namespace: release-namespace


# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
Expand All @@ -12,6 +12,9 @@ namePrefix: keepalived-operator-
#commonLabels:
# someName: someValue

resources:
- service-account.yaml

bases:
- ../rbac
- ../prometheus
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: keepalived-operator-controller-manager
name: controller-manager
namespace: system

0 comments on commit 55b57e3

Please sign in to comment.