diff --git a/common/pkg/openapi/patterns/anchored.go b/api/openapi/patterns/anchored.go similarity index 100% rename from common/pkg/openapi/patterns/anchored.go rename to api/openapi/patterns/anchored.go diff --git a/common/pkg/openapi/patterns/distribution.go b/api/openapi/patterns/distribution.go similarity index 100% rename from common/pkg/openapi/patterns/distribution.go rename to api/openapi/patterns/distribution.go diff --git a/common/pkg/openapi/patterns/dns1123.go b/api/openapi/patterns/dns1123.go similarity index 100% rename from common/pkg/openapi/patterns/dns1123.go rename to api/openapi/patterns/dns1123.go diff --git a/common/pkg/openapi/patterns/generic.go b/api/openapi/patterns/generic.go similarity index 100% rename from common/pkg/openapi/patterns/generic.go rename to api/openapi/patterns/generic.go diff --git a/common/pkg/openapi/patterns/net.go b/api/openapi/patterns/net.go similarity index 100% rename from common/pkg/openapi/patterns/net.go rename to api/openapi/patterns/net.go diff --git a/api/v1alpha1/clusterconfig_types.go b/api/v1alpha1/clusterconfig_types.go index c04ba04e1..ac34dec3a 100644 --- a/api/v1alpha1/clusterconfig_types.go +++ b/api/v1alpha1/clusterconfig_types.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/openapi/patterns" + "github.com/d2iq-labs/capi-runtime-extensions/api/openapi/patterns" ) const ( diff --git a/api/v1alpha1/docker_node_types.go b/api/v1alpha1/docker_node_types.go index 2fc2d5efd..422645e85 100644 --- a/api/v1alpha1/docker_node_types.go +++ b/api/v1alpha1/docker_node_types.go @@ -6,11 +6,11 @@ package v1alpha1 import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/openapi/patterns" + "github.com/d2iq-labs/capi-runtime-extensions/api/openapi/patterns" ) type DockerNodeSpec struct { - //+optional + // +optional CustomImage *OCIImage `json:"customImage,omitempty"` }