File tree Expand file tree Collapse file tree 4 files changed +12
-13
lines changed Expand file tree Collapse file tree 4 files changed +12
-13
lines changed Original file line number Diff line number Diff line change @@ -126,7 +126,7 @@ jobs:
126126 printf "Update generated parts of helm chart\n"
127127 make before-push
128128 printf "Install helm chart\n"
129- helm install -n lightrun-k8s-operator lightrun-k8s-operator ./helm-chart -f .github/workflows/tests_data/chart_values.yaml
129+ helm install -n lightrun-k8s-operator lightrun-k8s-operator ./charts/lightrun-operator -f .github/workflows/tests_data/chart_values.yaml
130130
131131 kubectl wait deployment sample-deployment --for condition=Available=True --timeout=90s
132132
Original file line number Diff line number Diff line change 88 paths-ignore :
99 - lightrun-init-agent/*
1010 - .github/**
11- - helm-chart/*
12- - charts/*
11+ - charts/**
1312 - grafana/*
1413 - config/*
1514 - examples/*
@@ -55,12 +54,12 @@ jobs:
5554 - name : Install Helm
5655 uses : azure/setup-helm@v4
5756
58- - name : Pack Helm chart
57+ - name : Pack Operator Helm chart
5958 shell : bash
6059 run : |
61- yq -i '.version = "${{steps.release_tag.outputs.new_tag}}"' helm-chart /Chart.yaml
62- yq -i '.controllerManager.manager.image.tag = "${{steps.release_tag.outputs.new_tag}}"' helm-chart /values.yaml
63- helm package ./helm-chart -u -d ./helm-repo/
60+ yq -i '.version = "${{steps.release_tag.outputs.new_tag}}"' charts/lightrun-operator /Chart.yaml
61+ yq -i '.controllerManager.manager.image.tag = "${{steps.release_tag.outputs.new_tag}}"' charts/lightrun-operator /values.yaml
62+ helm package ./charts/lightrun-operator -u -d ./helm-repo/
6463 - name : Pack Lightrun Agents Helm chart
6564 shell : bash
6665 run : |
Original file line number Diff line number Diff line change @@ -173,10 +173,10 @@ deploy-to-file: manifests kustomize ## Prepare all manifests in 1 file.
173173
174174.PHONY : before-push
175175before-push : manifests generate kustomize fmt vet deploy-to-file
176- $(KUSTOMIZE ) build config/crd --output helm-chart /crds/lightrunjavaagent_crd.yaml
177- $(KUSTOMIZE ) build config/rbac | yq ' select(.metadata.name == "leader-election-role").rules' > helm-chart /generated/rbac_leader_election_rules.yaml
178- $(KUSTOMIZE ) build config/rbac | yq ' select(.metadata.name == "manager-role").rules' > helm-chart /generated/rbac_manager_rules.yaml
179- helm template ./helm-chart > examples/operator.yaml --include-crds --namespace lightrun-operator
176+ $(KUSTOMIZE ) build config/crd --output charts/lightrun-operator /crds/lightrunjavaagent_crd.yaml
177+ $(KUSTOMIZE ) build config/rbac | yq ' select(.metadata.name == "leader-election-role").rules' > charts/lightrun-operator /generated/rbac_leader_election_rules.yaml
178+ $(KUSTOMIZE ) build config/rbac | yq ' select(.metadata.name == "manager-role").rules' > charts/lightrun-operator /generated/rbac_manager_rules.yaml
179+ helm template ./charts/lightrun-operator > examples/operator.yaml --include-crds --namespace lightrun-operator
180180
181181# # Location to install dependencies to
182182LOCALBIN ?= $(shell pwd) /bin
Original file line number Diff line number Diff line change @@ -84,14 +84,14 @@ kubectl apply -f agent.yaml -n lightrun-agent-test
8484
8585## Example with Helm Chart
8686
87- [ Helm chart] ( ../helm-chart / ) is available in repository branch ` helm-repo `
87+ [ Helm chart] ( ../charts/lightrun-operator / ) is available in repository branch ` helm-repo `
8888- Add the repo to your Helm repository list
8989``` sh
9090helm repo add lightrun-k8s-operator https://lightrun-platform.github.io/lightrun-k8s-operator
9191```
9292
9393- Install the Helm chart:
94- > _ Using default [ values] ( ../helm-chart /values.yaml ) _
94+ > _ Using default [ values] ( ../charts/lightrun-operator /values.yaml ) _
9595
9696``` sh
9797helm install lightrun-k8s-operator/lightrun-k8s-operator -n lightrun-operator --create-namespace
You can’t perform that action at this time.
0 commit comments