diff --git a/.github/workflows/odimra_deployment.yml b/.github/workflows/odimra_deployment.yml index 0ec9caadd..22cb40061 100644 --- a/.github/workflows/odimra_deployment.yml +++ b/.github/workflows/odimra_deployment.yml @@ -198,16 +198,16 @@ jobs: echo "==============updating the docker handler=========" cd ${ODIM_CONTROLLER_PATH}/kubespray - tar -xvzf kubespray-2.20.0.tar.gz - cd kubespray-2.20.0/roles/container-engine/docker/handlers + tar -xvzf kubespray-2.22.1.tar.gz + cd kubespray-2.20.1/roles/container-engine/docker/handlers sed -i "22,32d" main.yml sed -i "7,8d" main.yml cat main.yml cd ${ODIM_CONTROLLER_PATH}/kubespray - tar -cvzf kubespray-2.20.0.tar.gz kubespray-2.20.0 + tar -cvzf kubespray-2.22.1.tar.gz kubespray-2.22.1 - rm -rf kubespray-2.20.0 + rm -rf kubespray-2.22.1 ls diff --git a/lib-dmtf/model/resourceCollection.go b/lib-dmtf/model/resourceCollection.go index 781dade9d..5bf3eb001 100644 --- a/lib-dmtf/model/resourceCollection.go +++ b/lib-dmtf/model/resourceCollection.go @@ -16,16 +16,16 @@ package model // Collection is the redfish resource collection model according to the 2020.3 release type Collection struct { - ODataContext string `json:"@odata.context,omitempty"` - ODataEtag string `json:"@odata.etag,omitempty"` - ODataID string `json:"@odata.id"` - ODataType string `json:"@odata.type"` - Description string `json:"Description,omitempty"` - Name string `json:"Name"` - Members []*Link `json:"Members"` - MembersCount int `json:"Members@odata.count"` - MemberNavigationLink string `json:"Members@odata.navigationLink,omitempty"` - Oem interface{} `json:"Oem,omitempty"` - MembersNextLink string `json:"Members@odata.nextLink,omitempty"` - CollectionCapabilitie CollectionCapabilities `json:"@Redfish.CollectionCapabilities,omitempty"` + ODataContext string `json:"@odata.context,omitempty"` + ODataEtag string `json:"@odata.etag,omitempty"` + ODataID string `json:"@odata.id"` + ODataType string `json:"@odata.type"` + Description string `json:"Description,omitempty"` + Name string `json:"Name"` + Members []*Link `json:"Members"` + MembersCount int `json:"Members@odata.count"` + MemberNavigationLink string `json:"Members@odata.navigationLink,omitempty"` + Oem interface{} `json:"Oem,omitempty"` + MembersNextLink string `json:"Members@odata.nextLink,omitempty"` + CollectionCapabilitie *CollectionCapabilities `json:"@Redfish.CollectionCapabilities,omitempty"` } diff --git a/odim-controller/kubespray/kubespray-2.20.0.tar.gz b/odim-controller/kubespray/kubespray-2.20.0.tar.gz deleted file mode 100644 index 9f97dba99..000000000 Binary files a/odim-controller/kubespray/kubespray-2.20.0.tar.gz and /dev/null differ diff --git a/odim-controller/kubespray/kubespray-2.22.1.tar.gz b/odim-controller/kubespray/kubespray-2.22.1.tar.gz new file mode 100644 index 000000000..82b8b105a Binary files /dev/null and b/odim-controller/kubespray/kubespray-2.22.1.tar.gz differ