Commit 5c5e9dc
authored
Prevent csv-finalizer Job from being included in operator release yamls (#2063)
Summary: Prevent csv-finalizer Job from being included in operator
release yamls
#2059 introduced a new Job that fixed helm's uninstall issues caused by
OLM's recent csv-finalizer addition. This properly addressed the helm
issues in #1917, however, it
broke the `px` cli install process since the Job wasn't excluded from
the operator release yamls. This results in `px-operator` namespace
termination as the cli is trying to deploy the vizier since the Job runs
unconditionally.
This change also renames the `deleter_role.yaml` file since it seems to
be accidentally included in the operator release yamls. Please see
testing done for how this was determined to be extraneous.
Relevant Issues: #1917
Type of change: /kind bug
Test Plan: Verified the following
- [x] `helm template` includes the `csv-finalizer` job
```
# Create dummy Chart.yaml to appease helm
$ helm template --set deployOLM=true k8s/operator/helm/ | grep 'csv-deleter'
# Source: pixie/templates/csv-deleter.yaml
name: csv-deleter
```
- [x] `bazel build k8s/operator:operator_templates` no longer includes
the `csv-finalizer` job or the `deleter_role.yaml`
```
$ tar -tf bazel-bin/k8s/operator/operator_templates.tar
yamls/
yamls/crds/
yamls/crds/olm_crd.yaml
yamls/crds/vizier_crd.yaml
yamls/templates/
yamls/templates/00_olm.yaml
yamls/templates/01_px_olm.yaml
yamls/templates/02_catalog.yaml
yamls/templates/03_subscription.yaml
yamls/templates/04_vizier.yaml
```
- [x] Verified deleter role is excluded from `px deploy`'s extracted
yaml.
[This](https://github.com/pixie-io/pixie/blob/9effb349be7a42f8b45ca8fce6cbfdac619349ac/src/utils/shared/artifacts/yamls.go#L165-L170)
code excludes anything that isn't a "crd" file or is isn't numerically
prefixed, which means the deleter role isn't included for `px` cli
deploys
```
$ px deploy --operator_version=0.1.7-pre-z1.0 -e . --deploy_key=<deploy_key>
$ tree pixie_yamls/
pixie_yamls/
├── 00_olm_crd.yaml
├── 01_vizier_crd.yaml
├── 02_olm.yaml
├── 03_px_olm.yaml
├── 04_catalog.yaml
├── 05_subscription.yaml
└── 06_vizier.yaml
1 directory, 7 files
```
---------
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>1 parent 9effb34 commit 5c5e9dc
File tree
3 files changed
+53
-51
lines changed- k8s/operator/helm/templates
3 files changed
+53
-51
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
228 | 228 | | |
229 | 229 | | |
230 | 230 | | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | 231 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
File renamed without changes.
0 commit comments