Skip to content

Commit

Permalink
neonvm: Fix double prefix in image loader (#993)
Browse files Browse the repository at this point in the history
Basically, we were applying the 'neonvm-' prefix twice when we added
neonvm-runner-image-loader into neonvm.yaml (see #988 for more).

The diff in neonvm.yaml from the #988 to now:

```diff
4007c4007
<   name: neonvm-neonvm-runner-image-loader
---
>   name: neonvm-runner-image-loader
```

(i.e., the name of the daemonset is corrected, as it should be)

And, there is no diff in neonvm-runner-image-loader.
  • Loading branch information
sharnoff authored Jun 25, 2024
1 parent 1de4aa4 commit a3032a7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ render-manifests: $(RENDERED) kustomize
# Prepare:
cd neonvm/config/controller && $(KUSTOMIZE) edit set image controller=$(IMG_CONTROLLER) && $(KUSTOMIZE) edit add annotation buildtime:$(BUILDTS) --force
cd neonvm/config/vxlan-controller && $(KUSTOMIZE) edit set image vxlan-controller=$(IMG_VXLAN_CONTROLLER) && $(KUSTOMIZE) edit add annotation buildtime:$(BUILDTS) --force
cd neonvm/runner-image-loader && $(KUSTOMIZE) edit set image runner=$(IMG_RUNNER) && $(KUSTOMIZE) edit add annotation buildtime:$(BUILDTS) --force
cd neonvm/runner-image-loader/bases && $(KUSTOMIZE) edit set image runner=$(IMG_RUNNER) && $(KUSTOMIZE) edit add annotation buildtime:$(BUILDTS) --force
cd deploy/scheduler && $(KUSTOMIZE) edit set image autoscale-scheduler=$(IMG_SCHEDULER) && $(KUSTOMIZE) edit add annotation buildtime:$(BUILDTS) --force
cd deploy/agent && $(KUSTOMIZE) edit set image autoscaler-agent=$(IMG_AUTOSCALER_AGENT) && $(KUSTOMIZE) edit add annotation buildtime:$(BUILDTS) --force
# Build:
Expand All @@ -265,15 +265,15 @@ render-manifests: $(RENDERED) kustomize
# Cleanup:
cd neonvm/config/controller && $(KUSTOMIZE) edit set image controller=controller:dev && $(KUSTOMIZE) edit remove annotation buildtime --ignore-non-existence
cd neonvm/config/vxlan-controller && $(KUSTOMIZE) edit set image vxlan-controller=vxlan-controller:dev && $(KUSTOMIZE) edit remove annotation buildtime --ignore-non-existence
cd neonvm/runner-image-loader && $(KUSTOMIZE) edit set image runner=runner:dev && $(KUSTOMIZE) edit remove annotation buildtime --ignore-non-existence
cd neonvm/runner-image-loader/bases && $(KUSTOMIZE) edit set image runner=runner:dev && $(KUSTOMIZE) edit remove annotation buildtime --ignore-non-existence
cd deploy/scheduler && $(KUSTOMIZE) edit set image autoscale-scheduler=autoscale-scheduler:dev && $(KUSTOMIZE) edit remove annotation buildtime --ignore-non-existence
cd deploy/agent && $(KUSTOMIZE) edit set image autoscaler-agent=autoscaler-agent:dev && $(KUSTOMIZE) edit remove annotation buildtime --ignore-non-existence

render-release: $(RENDERED) kustomize
# Prepare:
cd neonvm/config/controller && $(KUSTOMIZE) edit set image controller=$(IMG_CONTROLLER)
cd neonvm/config/vxlan-controller && $(KUSTOMIZE) edit set image vxlan-controller=$(IMG_VXLAN_CONTROLLER)
cd neonvm/runner-image-loader && $(KUSTOMIZE) edit set image runner=$(IMG_RUNNER)
cd neonvm/runner-image-loader/bases && $(KUSTOMIZE) edit set image runner=$(IMG_RUNNER)
cd deploy/scheduler && $(KUSTOMIZE) edit set image autoscale-scheduler=$(IMG_SCHEDULER)
cd deploy/agent && $(KUSTOMIZE) edit set image autoscaler-agent=$(IMG_AUTOSCALER_AGENT)
# Build:
Expand All @@ -287,7 +287,7 @@ render-release: $(RENDERED) kustomize
# Cleanup:
cd neonvm/config/controller && $(KUSTOMIZE) edit set image controller=controller:dev
cd neonvm/config/vxlan-controller && $(KUSTOMIZE) edit set image vxlan-controller=vxlan-controller:dev
cd neonvm/runner-image-loader && $(KUSTOMIZE) edit set image runner=runner:dev
cd neonvm/runner-image-loader/bases && $(KUSTOMIZE) edit set image runner=runner:dev
cd deploy/scheduler && $(KUSTOMIZE) edit set image autoscale-scheduler=autoscale-scheduler:dev
cd deploy/agent && $(KUSTOMIZE) edit set image autoscaler-agent=autoscaler-agent:dev

Expand Down
3 changes: 2 additions & 1 deletion neonvm/config/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namePrefix: neonvm-
# someName: someValue

bases:
- namespace
- crd
- rbac
- controller
Expand All @@ -23,7 +24,7 @@ bases:
- vxlan-controller
- network
- device-plugin
- ../runner-image-loader
- ../runner-image-loader/bases

patchesStrategicMerge:
- webhookcainjection_patch.yaml
Expand Down
File renamed without changes.
10 changes: 10 additions & 0 deletions neonvm/runner-image-loader/bases/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- daemonset.yaml

images:
- name: runner
newName: runner
newTag: dev
3 changes: 1 addition & 2 deletions neonvm/runner-image-loader/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ namespace: neonvm-system
namePrefix: neonvm-

resources:
- daemonset.yaml
- bases
- ../config/namespace

images:
- name: runner
newName: runner
Expand Down

0 comments on commit a3032a7

Please sign in to comment.