Merge pull request #2154 from shiftstack/new-capi

🌱 Bump CAPI to v1.8.1

Author: k8s-ci-robot

Makefile

@@ -294,16 +294,13 @@ generate-orc:
 	$(MAKE) -C $(REPO_ROOT)/orc generate
 
 .PHONY: generate-conversion-gen
-capo_module := sigs.k8s.io/cluster-api-provider-openstack
 generate-conversion-gen: $(CONVERSION_GEN)
 	$(CONVERSION_GEN) \
-		--input-dirs=$(capo_module)/api/v1alpha6 \
-		--input-dirs=$(capo_module)/api/v1alpha7 \
-		--extra-dirs=$(capo_module)/pkg/utils/optional \
-		--extra-dirs=$(capo_module)/pkg/utils/conversioncommon \
-		--output-file-base=zz_generated.conversion \
-		--trim-path-prefix=$(capo_module)/ \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+		--extra-peer-dirs=./pkg/utils/optional \
+		--extra-peer-dirs=./pkg/utils/conversioncommon \
+		--output-file=zz_generated.conversion.go \
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
+		./api/v1alpha6 ./api/v1alpha7
 
 .PHONY: generate-manifests
 generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.

api_violations.report

@@ -1,98 +1,3 @@
-API rule violation: list_type_missing,k8s.io/api/core/v1,AvoidPods,PreferAvoidPods
-API rule violation: list_type_missing,k8s.io/api/core/v1,Capabilities,Add
-API rule violation: list_type_missing,k8s.io/api/core/v1,Capabilities,Drop
-API rule violation: list_type_missing,k8s.io/api/core/v1,CephFSPersistentVolumeSource,Monitors
-API rule violation: list_type_missing,k8s.io/api/core/v1,CephFSVolumeSource,Monitors
-API rule violation: list_type_missing,k8s.io/api/core/v1,ComponentStatus,Conditions
-API rule violation: list_type_missing,k8s.io/api/core/v1,ConfigMapProjection,Items
-API rule violation: list_type_missing,k8s.io/api/core/v1,ConfigMapVolumeSource,Items
-API rule violation: list_type_missing,k8s.io/api/core/v1,Container,Args
-API rule violation: list_type_missing,k8s.io/api/core/v1,Container,Command
-API rule violation: list_type_missing,k8s.io/api/core/v1,Container,Env
-API rule violation: list_type_missing,k8s.io/api/core/v1,Container,EnvFrom
-API rule violation: list_type_missing,k8s.io/api/core/v1,Container,VolumeDevices
-API rule violation: list_type_missing,k8s.io/api/core/v1,Container,VolumeMounts
-API rule violation: list_type_missing,k8s.io/api/core/v1,ContainerImage,Names
-API rule violation: list_type_missing,k8s.io/api/core/v1,DownwardAPIProjection,Items
-API rule violation: list_type_missing,k8s.io/api/core/v1,DownwardAPIVolumeSource,Items
-API rule violation: list_type_missing,k8s.io/api/core/v1,EndpointSubset,Addresses
-API rule violation: list_type_missing,k8s.io/api/core/v1,EndpointSubset,NotReadyAddresses
-API rule violation: list_type_missing,k8s.io/api/core/v1,EndpointSubset,Ports
-API rule violation: list_type_missing,k8s.io/api/core/v1,Endpoints,Subsets
-API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Args
-API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Command
-API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Env
-API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,EnvFrom
-API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,VolumeDevices
-API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,VolumeMounts
-API rule violation: list_type_missing,k8s.io/api/core/v1,ExecAction,Command
-API rule violation: list_type_missing,k8s.io/api/core/v1,FCVolumeSource,TargetWWNs
-API rule violation: list_type_missing,k8s.io/api/core/v1,FCVolumeSource,WWIDs
-API rule violation: list_type_missing,k8s.io/api/core/v1,HTTPGetAction,HTTPHeaders
-API rule violation: list_type_missing,k8s.io/api/core/v1,HostAlias,Hostnames
-API rule violation: list_type_missing,k8s.io/api/core/v1,ISCSIPersistentVolumeSource,Portals
-API rule violation: list_type_missing,k8s.io/api/core/v1,ISCSIVolumeSource,Portals
-API rule violation: list_type_missing,k8s.io/api/core/v1,LimitRangeSpec,Limits
-API rule violation: list_type_missing,k8s.io/api/core/v1,LoadBalancerStatus,Ingress
-API rule violation: list_type_missing,k8s.io/api/core/v1,NamespaceSpec,Finalizers
-API rule violation: list_type_missing,k8s.io/api/core/v1,NamespaceStatus,Conditions
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeAffinity,PreferredDuringSchedulingIgnoredDuringExecution
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeSelector,NodeSelectorTerms
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeSelectorRequirement,Values
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeSelectorTerm,MatchExpressions
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeSelectorTerm,MatchFields
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeSpec,PodCIDRs
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeSpec,Taints
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeStatus,Addresses
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeStatus,Conditions
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeStatus,Images
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeStatus,VolumesAttached
-API rule violation: list_type_missing,k8s.io/api/core/v1,NodeStatus,VolumesInUse
-API rule violation: list_type_missing,k8s.io/api/core/v1,PersistentVolumeClaimSpec,AccessModes
-API rule violation: list_type_missing,k8s.io/api/core/v1,PersistentVolumeClaimStatus,AccessModes
-API rule violation: list_type_missing,k8s.io/api/core/v1,PersistentVolumeClaimStatus,Conditions
-API rule violation: list_type_missing,k8s.io/api/core/v1,PersistentVolumeSpec,AccessModes
-API rule violation: list_type_missing,k8s.io/api/core/v1,PersistentVolumeSpec,MountOptions
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodAffinity,PreferredDuringSchedulingIgnoredDuringExecution
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodAffinity,RequiredDuringSchedulingIgnoredDuringExecution
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodAffinityTerm,Namespaces
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodAntiAffinity,PreferredDuringSchedulingIgnoredDuringExecution
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodAntiAffinity,RequiredDuringSchedulingIgnoredDuringExecution
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodDNSConfig,Nameservers
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodDNSConfig,Options
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodDNSConfig,Searches
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodExecOptions,Command
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodPortForwardOptions,Ports
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSecurityContext,SupplementalGroups
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSecurityContext,Sysctls
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSpec,Containers
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSpec,EphemeralContainers
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSpec,HostAliases
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSpec,ImagePullSecrets
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSpec,InitContainers
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSpec,ReadinessGates
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSpec,Tolerations
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodSpec,Volumes
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodStatus,Conditions
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodStatus,ContainerStatuses
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodStatus,EphemeralContainerStatuses
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodStatus,InitContainerStatuses
-API rule violation: list_type_missing,k8s.io/api/core/v1,PodStatus,PodIPs
-API rule violation: list_type_missing,k8s.io/api/core/v1,ProjectedVolumeSource,Sources
-API rule violation: list_type_missing,k8s.io/api/core/v1,RBDPersistentVolumeSource,CephMonitors
-API rule violation: list_type_missing,k8s.io/api/core/v1,RBDVolumeSource,CephMonitors
-API rule violation: list_type_missing,k8s.io/api/core/v1,ReplicationControllerStatus,Conditions
-API rule violation: list_type_missing,k8s.io/api/core/v1,ResourceQuotaSpec,Scopes
-API rule violation: list_type_missing,k8s.io/api/core/v1,ScopeSelector,MatchExpressions
-API rule violation: list_type_missing,k8s.io/api/core/v1,ScopedResourceSelectorRequirement,Values
-API rule violation: list_type_missing,k8s.io/api/core/v1,SecretProjection,Items
-API rule violation: list_type_missing,k8s.io/api/core/v1,SecretVolumeSource,Items
-API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceAccount,ImagePullSecrets
-API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceAccount,Secrets
-API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceSpec,ExternalIPs
-API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceSpec,LoadBalancerSourceRanges
-API rule violation: list_type_missing,k8s.io/api/core/v1,TopologySelectorLabelRequirement,Values
-API rule violation: list_type_missing,k8s.io/api/core/v1,TopologySelectorTerm,MatchLabelExpressions
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackFloatingIPPoolSpec,PreAllocatedFloatingIPs
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackFloatingIPPoolStatus,AvailableIPs
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackFloatingIPPoolStatus,ClaimedIPs
@@ -163,22 +68,15 @@ API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,Cluste
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatusVariable,Definitions
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Enum
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Required
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineDeploymentVariables,Overrides
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckClass,UnhealthyConditions
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckSpec,UnhealthyConditions
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckStatus,Targets
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachinePoolClass,FailureDomains
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachinePoolTopology,FailureDomains
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachinePoolVariables,Overrides
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,NetworkRanges,CIDRBlocks
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchDefinition,JSONPatches
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchSelectorMatchMachineDeploymentClass,Names
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchSelectorMatchMachinePoolClass,Names
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,Topology,Variables
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,WorkersClass,MachineDeployments
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,WorkersClass,MachinePools
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,WorkersTopology,MachineDeployments
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,WorkersTopology,MachinePools
 API rule violation: names_match,k8s.io/api/core/v1,AzureDiskVolumeSource,DataDiskURI
 API rule violation: names_match,k8s.io/api/core/v1,ContainerStatus,LastTerminationState
 API rule violation: names_match,k8s.io/api/core/v1,DaemonEndpoint,Port
@@ -190,7 +88,6 @@ API rule violation: names_match,k8s.io/api/core/v1,ISCSIPersistentVolumeSource,D
 API rule violation: names_match,k8s.io/api/core/v1,ISCSIPersistentVolumeSource,SessionCHAPAuth
 API rule violation: names_match,k8s.io/api/core/v1,ISCSIVolumeSource,DiscoveryCHAPAuth
 API rule violation: names_match,k8s.io/api/core/v1,ISCSIVolumeSource,SessionCHAPAuth
-API rule violation: names_match,k8s.io/api/core/v1,NodeResources,Capacity
 API rule violation: names_match,k8s.io/api/core/v1,NodeSpec,DoNotUseExternalID
 API rule violation: names_match,k8s.io/api/core/v1,PersistentVolumeSource,CephFS
 API rule violation: names_match,k8s.io/api/core/v1,PersistentVolumeSource,StorageOS
@@ -251,4 +148,6 @@ API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v
 API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Router,IPs
 API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6AddressMode
 API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6RAMode
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XMetadata
 API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XPreserveUnknownFields
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XValidations

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

@@ -22,7 +22,8 @@ spec:
           args:
             - "--leader-elect"
             - "--v=2"
-            - "--metrics-bind-addr=127.0.0.1:8080"
+            - "--diagnostics-address=127.0.0.1:8080"
+            - "--insecure-diagnostics=true"
           image: controller:latest
           imagePullPolicy: Always
           name: manager