airship/airshipctl
Code Issues Proposed changes

Added missing properties to catalogues

Browse Source 
* added bond_xmit_hash_policy property to network catalogues
* added sourceRef chart property to versions catalogues
* corrected code typos

Change-Id: Idda5e7628df3631688b84e4d62749ab173c9933f
This commit is contained in:
Pallav Gupta 2021-05-06 15:02:32 -07:00 committed by Andrii Ostapenko
parent 93d9967ada
commit 7cfffde323
No known key found for this signature in database
GPG Key ID: F3E83668DBB223B3
5 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/function/airshipctl-schemas/airshipit.org_networkcatalogues.yaml
View File

@ -53,6 +53,8 @@ spec:
type: integer
bond_mode:
type: string
bond_xmit_hash_policy:
type: string
id:
type: string
mtu:

17
manifests/function/airshipctl-schemas/airshipit.org_versionscatalogues.yaml
View File

@ -92,10 +92,22 @@ spec:
charts:
additionalProperties:
description: ChartProperties defines the properties of the chart
like Chart and vesrion
like Chart and version
properties:
chart:
type: string
sourceRef:
description: ChartSourceRef defines the properties of the Chart
SourceRef like Kind and Name
properties:
kind:
type: string
name:
type: string
required:
- kind
- name
type: object
version:
type: string
required:
@ -215,9 +227,6 @@ spec:
description: Allows for the specification of the kubernetes version
being used.
type: string
required:
- capi_images
- images
type: object
type: object
served: true

21
pkg/api/v1alpha1/networkcatalogue_types.go
View File

@ -35,16 +35,17 @@ type HostNetworkingSpec struct {
// Link defines the properties of the network link
type Link struct {
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Type string `json:"type,omitempty"`
MTU string `json:"mtu,omitempty"`
BondLinks []string `json:"bond_links,omitempty"`
BondMode string `json:"bond_mode,omitempty"`
BondMiimon int `json:"bond_miimon,omitempty"`
VlanLink string `json:"vlan_link,omitempty"`
VlanID int `json:"vlan_id,omitempty"`
VlanMacAddress string `json:"vlan_mac_address,omitempty"`
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Type string `json:"type,omitempty"`
MTU string `json:"mtu,omitempty"`
BondLinks []string `json:"bond_links,omitempty"`
BondMode string `json:"bond_mode,omitempty"`
BondMiimon int `json:"bond_miimon,omitempty"`
BondXmitHashPolicy string `json:"bond_xmit_hash_policy,omitempty"`
VlanLink string `json:"vlan_link,omitempty"`
VlanID int `json:"vlan_id,omitempty"`
VlanMacAddress string `json:"vlan_mac_address,omitempty"`
}
// IPFormat Regex to support both IPV4 and IPV6 format

17
pkg/api/v1alpha1/versionscatalogue_types.go
View File

@ -31,10 +31,17 @@ type RepoProperties struct {
// RepositorySpec defines the additional properties for repository
type RepositorySpec map[string]RepoProperties
// ChartProperties defines the properties of the chart like Chart and vesrion
// ChartSourceRef defines the properties of the Chart SourceRef like Kind and Name
type ChartSourceRef struct {
Kind string `json:"kind"`
Name string `json:"name"`
}
// ChartProperties defines the properties of the chart like Chart and version
type ChartProperties struct {
Chart string `json:"chart"`
Version string `json:"version"`
Chart string `json:"chart"`
Version string `json:"version"`
SourceRef ChartSourceRef `json:"sourceRef,omitempty"`
}
// ChartSpec defines the spec for charts
@ -140,13 +147,13 @@ type VersionsCatalogueSpec struct {
// "repository" and "tag" properties defined. capi_images may also include an
// optional "ipam-manager" object, which must also have "repository" and "tag"
// properties defined.
CAPIImages CAPIImageSpec `json:"capi_images,omtiempty"`
CAPIImages CAPIImageSpec `json:"capi_images,omitempty"`
// images defines collections of images that are declared as complete
// URLs rather than as a collection of discrete parts, such as "repository" and
// "tag" or "sha". This section of the catalog is organized by
// airshipctl function -> Deployments in function -> images in Deployment.
Images ImageSpec `json:"images,omtiempty"`
Images ImageSpec `json:"images,omitempty"`
// image_components defines images that are declared using the Helm-style
// format that breaks image URLs into discrete parts, such as "repository" and "tag".

16
pkg/api/v1alpha1/zz_generated.deepcopy.go
View File

@ -322,6 +322,7 @@ func (in CAPIImageSpec) DeepCopy() CAPIImageSpec {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ChartProperties) DeepCopyInto(out *ChartProperties) {
*out = *in
out.SourceRef = in.SourceRef
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ChartProperties.
@ -334,6 +335,21 @@ func (in *ChartProperties) DeepCopy() *ChartProperties {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ChartSourceRef) DeepCopyInto(out *ChartSourceRef) {
*out = *in
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ChartSourceRef.
func (in *ChartSourceRef) DeepCopy() *ChartSourceRef {
if in == nil {
return nil
}
out := new(ChartSourceRef)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in ChartSpec) DeepCopyInto(out *ChartSpec) {
{