Merge pull request #865 from Daimler/schloc/remove-v1alpha4-UserDataSecret

✨ api/v1alpha4 remove obsolete UserDataSecret field

Author: k8s-ci-robot

api/v1alpha3/conversion.go

@@ -112,3 +112,9 @@ func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) er
 func Convert_v1alpha3_OpenStackClusterSpec_To_v1alpha4_OpenStackClusterSpec(in *OpenStackClusterSpec, out *v1alpha4.OpenStackClusterSpec, s conversion.Scope) error {
 	return autoConvert_v1alpha3_OpenStackClusterSpec_To_v1alpha4_OpenStackClusterSpec(in, out, s)
 }
+
+// Convert_v1alpha3_OpenStackMachineSpec_To_v1alpha4_OpenStackMachineSpec is an autogenerated conversion function.
+// v1alpha4 drops the field .UserDataSecret which is why we reuqire to define the function here.
+func Convert_v1alpha3_OpenStackMachineSpec_To_v1alpha4_OpenStackMachineSpec(in *OpenStackMachineSpec, out *v1alpha4.OpenStackMachineSpec, s conversion.Scope) error {
+	return autoConvert_v1alpha3_OpenStackMachineSpec_To_v1alpha4_OpenStackMachineSpec(in, out, s)
+}

api/v1alpha3/zz_generated.conversion.go

@@ -68,9 +68,6 @@ type OpenStackMachineSpec struct {
 	// The names of the security groups to assign to the instance
 	SecurityGroups []SecurityGroupParam `json:"securityGroups,omitempty"`
 
-	// The name of the secret containing the user data (startup script in most cases)
-	UserDataSecret *corev1.SecretReference `json:"userDataSecret,omitempty"`
-
 	// Whether the server instance is created on a trunk port or not.
 	Trunk bool `json:"trunk,omitempty"`
 

api/v1alpha4/openstackmachine_types.go

@@ -1326,19 +1326,6 @@ spec:
                         description: Whether the server instance is created on a trunk
                           port or not.
                         type: boolean
-                      userDataSecret:
-                        description: The name of the secret containing the user data
-                          (startup script in most cases)
-                        properties:
-                          name:
-                            description: Name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: Namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
                     required:
                     - flavor
                     type: object

api/v1alpha4/zz_generated.deepcopy.go

@@ -619,19 +619,6 @@ spec:
                 description: Whether the server instance is created on a trunk port
                   or not.
                 type: boolean
-              userDataSecret:
-                description: The name of the secret containing the user data (startup
-                  script in most cases)
-                properties:
-                  name:
-                    description: Name is unique within a namespace to reference a
-                      secret resource.
-                    type: string
-                  namespace:
-                    description: Namespace defines the space within which the secret
-                      name must be unique.
-                    type: string
-                type: object
             required:
             - flavor
             type: object

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

@@ -565,19 +565,6 @@ spec:
                         description: Whether the server instance is created on a trunk
                           port or not.
                         type: boolean
-                      userDataSecret:
-                        description: The name of the secret containing the user data
-                          (startup script in most cases)
-                        properties:
-                          name:
-                            description: Name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: Namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
                     required:
                     - flavor
                     type: object