Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make manifest and make build-installer #202

Merged
merged 3 commits into from
Feb 21, 2025
Merged

Make manifest and make build-installer #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b299b48
console
spai-p9 Feb 20, 2025
480f109
Do a make manifest and build-installer
spai-p9 Feb 20, 2025
012c495
final fix build-installer
OmkarDeshpande7 Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deploy/00crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,8 +632,8 @@ spec:
spec:
description: Spec defines the desired state of VjailbreakNode
properties:
availableflavours:
description: AvailableFlavours is the list of available flavors in
availableflavors:
description: AvailableFlavors is the list of available flavors in
openstack
items:
description: |-
Expand Down Expand Up @@ -1447,7 +1447,7 @@ spec:
- --health-probe-bind-address=:8081
command:
- /manager
image: quay.io/platform9/vjailbreak-controller:v0.1.3
image: quay.io/platform9/vjailbreak-controller:v0.1.4
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion k8s/migration/api/v1alpha1/vjailbreaknode_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type VjailbreakNodeSpec struct {
ImageID string `json:"imageid,omitempty"`

// AvailableFlavors is the list of available flavors in openstack
AvailableFlavors []flavors.Flavor `json:"AvailableFlavors,omitempty"`
AvailableFlavors []flavors.Flavor `json:"availableflavors,omitempty"`
}

// VjailbreakNodeStatus defines the observed state of VjailbreakNode
Expand Down
4 changes: 2 additions & 2 deletions k8s/migration/config/crd/bases/vjailbreak.k8s.pf9.io_vjailbreaknodes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ spec:
spec:
description: Spec defines the desired state of VjailbreakNode
properties:
availableflavours:
description: AvailableFlavours is the list of available flavors in
availableflavors:
description: AvailableFlavors is the list of available flavors in
openstack
items:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion k8s/migration/config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/platform9/vjailbreak-controller
newTag: v0.1.3
newTag: v0.1.4
2 changes: 1 addition & 1 deletion ui/src/api/nodes/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export interface Spec {
noderole: string
openstackcreds: OpenstackCredsRef
openstackflavorid: string
AvailableFlavors?: OpenstackFlavor []
availableflavors?: OpenstackFlavor []
}

export interface Status {
Expand Down
8 changes: 6 additions & 2 deletions ui/src/pages/dashboard/ScaleUpDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,18 @@ export default function ScaleUpDrawer({ open, onClose, masterNode }: ScaleUpDraw
setLoadingFlavors(true);
try {
const response = await getMasterNode();
const flavours = response?.spec.AvailableFlavors;
console.log(response);
const flavours = response?.spec.availableflavors;
console.log(flavours);

if (!flavours) {
// retry for 3 times in a interval of 5 seconds
let retries = 0;
const interval = setInterval(async () => {
const response = await getMasterNode();
const flavours = response?.spec.AvailableFlavors
console.log(response);
const flavours = response?.spec.availableflavors
console.log(flavours);
if (flavours) {
clearInterval(interval);
setFlavors(flavours || []);
Expand Down
Loading