Skip to content

Commit 174e2e8

Browse files
committed
tests: e2e tests implemented
Signed-off-by: Bharath Nallapeta <[email protected]>
1 parent a0074c3 commit 174e2e8

22 files changed

+288
-87
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \
188188
cluster-template-flatcar-sysext.yaml \
189189
cluster-template-no-bastion.yaml \
190190
cluster-template-health-monitor.yaml \
191-
cluster-template-capi-v1beta1.yaml)
191+
cluster-template-capi-v1beta1.yaml \
192+
cluster-template-cluster-identity.yaml)
192193
# Currently no templates that require CI artifacts
193194
# $(addprefix $(E2E_TEMPLATES_DIR)/, add-templates-here.yaml) \
194195

api/v1beta1/identity_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ package v1beta1
1919
// OpenStackIdentityReference is a reference to an infrastructure
2020
// provider identity to be used to provision cluster resources.
2121
// +kubebuilder:validation:XValidation:rule="(!has(self.region) && !has(oldSelf.region)) || self.region == oldSelf.region",message="region is immutable"
22-
// +kubebuilder:validation:XValidation:rule="has(self.name)",message="name is required"
23-
// +kubebuilder:validation:XValidation:rule="has(self.cloudName)",message="cloudName is required"
2422
type OpenStackIdentityReference struct {
2523
// Type specifies the identity reference type. Defaults to Secret for backward compatibility.
2624
// +kubebuilder:validation:Enum=Secret;ClusterIdentity
@@ -33,10 +31,12 @@ type OpenStackIdentityReference struct {
3331
// The Secret must contain a key named `clouds.yaml` which contains an OpenStack clouds.yaml file.
3432
// The Secret may optionally contain a key named `cacert` containing a PEM-encoded CA certificate.
3533
// +kubebuilder:validation:Required
34+
// +kubebuilder:validation:MinLength=1
3635
Name string `json:"name"`
3736

3837
// CloudName specifies the name of the entry in the clouds.yaml file to use.
3938
// +kubebuilder:validation:Required
39+
// +kubebuilder:validation:MinLength=1
4040
CloudName string `json:"cloudName"`
4141

4242
// Region specifies an OpenStack region to use. If specified, it overrides

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

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

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml

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

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackfloatingippools.yaml

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

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml

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

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml

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

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackservers.yaml

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

config/crd/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ labels:
88
# It should be run by config/
99
resources:
1010
- bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml
11+
- bases/infrastructure.cluster.x-k8s.io_openstackclusteridentities.yaml
1112
- bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml
1213
- bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml
1314
- bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml

0 commit comments

Comments
 (0)