Skip to content
This repository was archived by the owner on Dec 16, 2025. It is now read-only.

Commit 5a5048f

Browse files
matofedermatofeder
committed
Update OpenStackClusterStackRelease and OpenStackNodeImageRelease types
Signed-off-by: Matej Feder <[email protected]>
1 parent 4086125 commit 5a5048f

File tree

261 files changed

+33815
-1551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+33815
-1551
lines changed

‎api/v1alpha1/openstackclusterstackrelease_types.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,19 @@ package v1alpha1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21+
22+
apiv1alpha7 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
2123
)
2224

2325
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
2426
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
2527

2628
// OpenStackClusterStackReleaseSpec defines the desired state of OpenStackClusterStackRelease.
2729
type OpenStackClusterStackReleaseSpec struct {
28-
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
29-
// Important: Run "make" to regenerate code after modifying this file
30-
31-
// Foo is an example field of OpenStackClusterStackRelease. Edit openstackclusterstackrelease_types.go to remove/update
32-
Foo string `json:"foo,omitempty"`
30+
// The name of the cloud to use from the clouds secret
31+
CloudName string `json:"cloudName"`
32+
// IdentityRef is a reference to a identity to be used when reconciling this cluster
33+
IdentityRef *apiv1alpha7.OpenStackIdentityReference `json:"identityRef,omitempty"`
3334
}
3435

3536
// OpenStackClusterStackReleaseStatus defines the observed state of OpenStackClusterStackRelease.

‎api/v1alpha1/openstacknodeimagerelease_types.go‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,30 @@ package v1alpha1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21+
22+
apiv1alpha7 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
2123
)
2224

2325
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
2426
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
2527

2628
// OpenStackNodeImageReleaseSpec defines the desired state of OpenStackNodeImageRelease.
2729
type OpenStackNodeImageReleaseSpec struct {
28-
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
29-
// Important: Run "make" to regenerate code after modifying this file
30-
31-
// Foo is an example field of OpenStackNodeImageRelease. Edit openstacknodeimagerelease_types.go to remove/update
32-
Foo string `json:"foo,omitempty"`
30+
// The name of the node image
31+
Name string `json:"name"`
32+
// The URL of the node image
33+
Url string `json:"url"`
34+
// The name of the cloud to use from the clouds secret
35+
CloudName string `json:"cloudName"`
36+
// IdentityRef is a reference to a identity to be used when reconciling this cluster
37+
IdentityRef *apiv1alpha7.OpenStackIdentityReference `json:"identityRef,omitempty"`
3338
}
3439

3540
// OpenStackNodeImageReleaseStatus defines the observed state of OpenStackNodeImageRelease.
3641
type OpenStackNodeImageReleaseStatus struct {
37-
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
38-
// Important: Run "make" to regenerate code after modifying this file
42+
// +optional
43+
// +kubebuilder:default:=false
44+
Ready bool `json:"ready,omitempty"`
3945
}
4046

4147
//+kubebuilder:object:root=true

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 16 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleases.yaml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,29 @@ spec:
4444
description: OpenStackClusterStackReleaseSpec defines the desired state
4545
of OpenStackClusterStackRelease.
4646
properties:
47-
foo:
48-
description: Foo is an example field of OpenStackClusterStackRelease.
49-
Edit openstackclusterstackrelease_types.go to remove/update
47+
cloudName:
48+
description: The name of the cloud to use from the clouds secret
5049
type: string
50+
identityRef:
51+
description: IdentityRef is a reference to a identity to be used when
52+
reconciling this cluster
53+
properties:
54+
kind:
55+
description: Kind of the identity. Must be supported by the infrastructure
56+
provider and may be either cluster or namespace-scoped.
57+
minLength: 1
58+
type: string
59+
name:
60+
description: Name of the infrastructure identity to be used. Must
61+
be either a cluster-scoped resource, or namespaced-scoped resource
62+
the same namespace as the resource(s) being provisioned.
63+
type: string
64+
required:
65+
- kind
66+
- name
67+
type: object
68+
required:
69+
- cloudName
5170
type: object
5271
status:
5372
description: OpenStackClusterStackReleaseStatus defines the observed state

‎config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,32 @@ spec:
4545
description: OpenStackClusterStackReleaseSpec defines the desired
4646
state of OpenStackClusterStackRelease.
4747
properties:
48-
foo:
49-
description: Foo is an example field of OpenStackClusterStackRelease.
50-
Edit openstackclusterstackrelease_types.go to remove/update
48+
cloudName:
49+
description: The name of the cloud to use from the clouds
50+
secret
5151
type: string
52+
identityRef:
53+
description: IdentityRef is a reference to a identity to be
54+
used when reconciling this cluster
55+
properties:
56+
kind:
57+
description: Kind of the identity. Must be supported by
58+
the infrastructure provider and may be either cluster
59+
or namespace-scoped.
60+
minLength: 1
61+
type: string
62+
name:
63+
description: Name of the infrastructure identity to be
64+
used. Must be either a cluster-scoped resource, or namespaced-scoped
65+
resource the same namespace as the resource(s) being
66+
provisioned.
67+
type: string
68+
required:
69+
- kind
70+
- name
71+
type: object
72+
required:
73+
- cloudName
5274
type: object
5375
required:
5476
- spec

‎config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,45 @@ spec:
3636
description: OpenStackNodeImageReleaseSpec defines the desired state of
3737
OpenStackNodeImageRelease.
3838
properties:
39-
foo:
40-
description: Foo is an example field of OpenStackNodeImageRelease.
41-
Edit openstacknodeimagerelease_types.go to remove/update
39+
cloudName:
40+
description: The name of the cloud to use from the clouds secret
4241
type: string
42+
identityRef:
43+
description: IdentityRef is a reference to a identity to be used when
44+
reconciling this cluster
45+
properties:
46+
kind:
47+
description: Kind of the identity. Must be supported by the infrastructure
48+
provider and may be either cluster or namespace-scoped.
49+
minLength: 1
50+
type: string
51+
name:
52+
description: Name of the infrastructure identity to be used. Must
53+
be either a cluster-scoped resource, or namespaced-scoped resource
54+
the same namespace as the resource(s) being provisioned.
55+
type: string
56+
required:
57+
- kind
58+
- name
59+
type: object
60+
name:
61+
description: The name of the node image
62+
type: string
63+
url:
64+
description: The URL of the node image
65+
type: string
66+
required:
67+
- cloudName
68+
- name
69+
- url
4370
type: object
4471
status:
4572
description: OpenStackNodeImageReleaseStatus defines the observed state
4673
of OpenStackNodeImageRelease.
74+
properties:
75+
ready:
76+
default: false
77+
type: boolean
4778
type: object
4879
type: object
4980
served: true

‎go.mod‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@ go 1.21
55
require (
66
github.com/onsi/ginkgo/v2 v2.13.2
77
github.com/onsi/gomega v1.30.0
8-
k8s.io/apimachinery v0.28.3
9-
k8s.io/client-go v0.28.3
8+
k8s.io/apimachinery v0.28.4
9+
k8s.io/client-go v0.28.4
10+
sigs.k8s.io/cluster-api-provider-openstack v0.9.0
1011
sigs.k8s.io/controller-runtime v0.16.3
1112
)
1213

1314
require (
1415
github.com/beorn7/perks v1.0.1 // indirect
1516
github.com/cespare/xxhash/v2 v2.2.0 // indirect
16-
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1718
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
18-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
19+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
1920
github.com/fsnotify/fsnotify v1.6.0 // indirect
2021
github.com/go-logr/logr v1.3.0 // indirect
2122
github.com/go-logr/zapr v1.2.4 // indirect
@@ -30,8 +31,9 @@ require (
3031
github.com/google/go-cmp v0.6.0 // indirect
3132
github.com/google/gofuzz v1.2.0 // indirect
3233
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
33-
github.com/google/uuid v1.3.0 // indirect
34-
github.com/imdario/mergo v0.3.6 // indirect
34+
github.com/google/uuid v1.3.1 // indirect
35+
github.com/gophercloud/gophercloud v1.7.0 // indirect
36+
github.com/imdario/mergo v0.3.15 // indirect
3537
github.com/josharian/intern v1.0.0 // indirect
3638
github.com/json-iterator/go v1.1.12 // indirect
3739
github.com/mailru/easyjson v0.7.7 // indirect
@@ -40,34 +42,37 @@ require (
4042
github.com/modern-go/reflect2 v1.0.2 // indirect
4143
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4244
github.com/pkg/errors v0.9.1 // indirect
43-
github.com/prometheus/client_golang v1.16.0 // indirect
44-
github.com/prometheus/client_model v0.4.0 // indirect
45+
github.com/prometheus/client_golang v1.17.0 // indirect
46+
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
4547
github.com/prometheus/common v0.44.0 // indirect
46-
github.com/prometheus/procfs v0.10.1 // indirect
48+
github.com/prometheus/procfs v0.11.1 // indirect
4749
github.com/spf13/pflag v1.0.5 // indirect
50+
github.com/stretchr/testify v1.8.4 // indirect
51+
go.uber.org/goleak v1.3.0 // indirect
4852
go.uber.org/multierr v1.11.0 // indirect
4953
go.uber.org/zap v1.25.0 // indirect
50-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
51-
golang.org/x/net v0.17.0 // indirect
52-
golang.org/x/oauth2 v0.8.0 // indirect
54+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
55+
golang.org/x/net v0.18.0 // indirect
56+
golang.org/x/oauth2 v0.14.0 // indirect
5357
golang.org/x/sys v0.14.0 // indirect
54-
golang.org/x/term v0.13.0 // indirect
55-
golang.org/x/text v0.13.0 // indirect
58+
golang.org/x/term v0.14.0 // indirect
59+
golang.org/x/text v0.14.0 // indirect
5660
golang.org/x/time v0.3.0 // indirect
5761
golang.org/x/tools v0.14.0 // indirect
5862
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
5963
google.golang.org/appengine v1.6.7 // indirect
60-
google.golang.org/protobuf v1.30.0 // indirect
64+
google.golang.org/protobuf v1.31.0 // indirect
6165
gopkg.in/inf.v0 v0.9.1 // indirect
6266
gopkg.in/yaml.v2 v2.4.0 // indirect
6367
gopkg.in/yaml.v3 v3.0.1 // indirect
64-
k8s.io/api v0.28.3 // indirect
65-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
66-
k8s.io/component-base v0.28.3 // indirect
68+
k8s.io/api v0.28.4 // indirect
69+
k8s.io/apiextensions-apiserver v0.28.4 // indirect
70+
k8s.io/component-base v0.28.4 // indirect
6771
k8s.io/klog/v2 v2.100.1 // indirect
6872
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
6973
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
74+
sigs.k8s.io/cluster-api v1.6.0 // indirect
7075
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7176
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
72-
sigs.k8s.io/yaml v1.3.0 // indirect
77+
sigs.k8s.io/yaml v1.4.0 // indirect
7378
)

0 commit comments

Comments
 (0)