knife-ionoscloud 5.1.0 → 6.0.0.alpha.1

data/lib/chef/knife/ionoscloud_nic_delete.rb

@@ -30,7 +30,7 @@ class Chef
         $stdout.sync = true
         validate_required_params(@required_options, config)
 
-        nic_api = Ionoscloud::NicApi.new(api_client)
+        nic_api = Ionoscloud::NetworkInterfacesApi.new(api_client)
         @name_args.each do |nic_id|
           begin
             nic = nic_api.datacenters_servers_nics_find_by_id(config[:datacenter_id], config[:server_id], nic_id)
@@ -45,7 +45,9 @@ class Chef
           msg_pair('IPs', nic.properties.ips)
           msg_pair('DHCP', nic.properties.dhcp)
           msg_pair('LAN', nic.properties.lan)
-          msg_pair('NAT', nic.properties.nat)
+          msg_pair('Firewall Type', nic.properties.firewall_type)
+          msg_pair('Device Number', nic.properties.device_number)
+          msg_pair('PCI Slot', nic.properties.pci_slot)
 
           begin
             confirm('Do you really want to delete this Nic')

data/lib/chef/knife/ionoscloud_nic_list.rb

@@ -35,22 +35,26 @@ class Chef
           ui.color('Name', :bold),
           ui.color('IPs', :bold),
           ui.color('DHCP', :bold),
-          ui.color('NAT', :bold),
-          ui.color('LAN', :bold)
+          ui.color('LAN', :bold),
+          ui.color('Firewall Type', :bold),
+          ui.color('Device Number', :bold),
+          ui.color('PCI Slot', :bold),
         ]
 
-        nic_api = Ionoscloud::NicApi.new(api_client)
+        nic_api = Ionoscloud::NetworkInterfacesApi.new(api_client)
 
         nic_api.datacenters_servers_nics_get(config[:datacenter_id], config[:server_id], { depth: 1 }).items.each do |nic|
           nic_list << nic.id
           nic_list << nic.properties.name
           nic_list << nic.properties.ips.to_s
           nic_list << nic.properties.dhcp.to_s
-          nic_list << nic.properties.nat.to_s
           nic_list << nic.properties.lan.to_s
+          nic_list << nic.properties.firewall_type.to_s
+          nic_list << nic.properties.device_number.to_s
+          nic_list << nic.properties.pci_slot.to_s
         end
 
-        puts ui.list(nic_list, :uneven_columns_across, 6)
+        puts ui.list(nic_list, :uneven_columns_across, 8)
       end
     end
   end

data/lib/chef/knife/ionoscloud_node_list.rb

@@ -12,7 +12,6 @@ class Chef
               long: '--cluster-id CLUSTER_ID',
               description: 'The ID of the K8s Cluster'
 
-
       option :nodepool_id,
               short: '-P NODEPOOL_ID',
               long: '--nodepool-id NODEPOOL_ID',

data/lib/chef/knife/ionoscloud_nodepool_create.rb

@@ -84,6 +84,13 @@ class Chef
               long: '--lans LAN_ID [LAN_ID]',
               description: 'An array of additional private LANs attached to worker nodes'
 
+      option :public_ips,
+              long: '--ips PUBLIC_IP [PUBLIC_IP]',
+              description: 'Optional array of reserved public IP addresses to be used by the nodes. '\
+              'IPs must be from same location as the data center used for the node pool. The array '\
+              'must contain one extra IP than maximum number of nodes could be. (nodeCount+1 if fixed '\
+              'node amount or maxNodeCount+1 if auto scaling is used) The extra provided IP Will be used during rebuilding of nodes.'
+
       attr_reader :description, :required_options
 
       def initialize(args = [])
@@ -106,37 +113,42 @@ class Chef
 
         kubernetes_api = Ionoscloud::KubernetesApi.new(api_client)
 
+        config[:public_ips] = config[:public_ips].split(',') if config[:public_ips]
+
         nodepool_properties = {
           name: config[:name],
-          k8sVersion: config[:version],
-          datacenterId: config[:datacenter_id],
-          nodeCount: config[:node_count],
-          cpuFamily: config[:cpu_family],
-          coresCount: config[:cores],
-          ramSize: config[:ram],
-          availabilityZone: config[:availability_zone],
-          storageType: config[:storage_type],
-          storageSize: config[:storage_size],
+          k8s_version: config[:version],
+          datacenter_id: config[:datacenter_id],
+          node_count: config[:node_count],
+          cpu_family: config[:cpu_family],
+          cores_count: config[:cores],
+          ram_size: config[:ram],
+          availability_zone: config[:availability_zone],
+          storage_type: config[:storage_type],
+          storage_size: config[:storage_size],
+          public_ips: config[:public_ips],
         }
 
         if config[:maintenance_day] && config[:maintenance_time]
-          nodepool_properties[:maintenanceWindow] = {
-            dayOfTheWeek: config[:maintenance_day],
+          nodepool_properties[:maintenance_window] = Ionoscloud::KubernetesMaintenanceWindow.new(
+            day_of_the_week: config[:maintenance_day],
             time: config[:maintenance_time],
-          }
+          )
         end
 
         if config[:min_node_count] || config[:max_node_count]
-          nodepool_properties[:autoScaling] = {}
-          nodepool_properties[:autoScaling][:minNodeCount] = config[:min_node_count] unless config[:min_node_count].nil?
-          nodepool_properties[:autoScaling][:maxNodeCount] = config[:max_node_count] unless config[:max_node_count].nil?
+          nodepool_properties[:auto_scaling] = Ionoscloud::KubernetesAutoScaling.new()
+          nodepool_properties[:auto_scaling].min_node_count = config[:min_node_count] unless config[:min_node_count].nil?
+          nodepool_properties[:auto_scaling].max_node_count = config[:max_node_count] unless config[:max_node_count].nil?
         end
 
         if config[:lans]
           nodepool_properties[:lans] = config[:lans].split(',').map! { |lan| { id: Integer(lan) } }
         end
 
-        nodepool = kubernetes_api.k8s_nodepools_post(config[:cluster_id], { properties: nodepool_properties })
+        nodepool = Ionoscloud::KubernetesNodePool.new(properties: Ionoscloud::KubernetesNodePoolPropertiesForPost.new(nodepool_properties))
+
+        nodepool = kubernetes_api.k8s_nodepools_post(config[:cluster_id], nodepool)
 
         auto_scaling = "Min node count: #{nodepool.properties.auto_scaling.min_node_count}, Max node count:#{nodepool.properties.auto_scaling.max_node_count}"
         maintenance_window = "#{nodepool.properties.maintenance_window.day_of_the_week}, #{nodepool.properties.maintenance_window.time}"
@@ -152,6 +164,20 @@ class Chef
         puts "#{ui.color('RAM', :cyan)}: #{nodepool.properties.ram_size}"
         puts "#{ui.color('Storage Type', :cyan)}: #{nodepool.properties.storage_type}"
         puts "#{ui.color('Storage Size', :cyan)}: #{nodepool.properties.storage_size}"
+        puts "#{ui.color('Lans', :cyan)}: #{nodepool.properties.lans.map do
+          |lan|
+          {
+            id: lan.id,
+            dhcp: lan.dhcp,
+            routes: lan.routes ? lan.routes.map do
+              |route|
+              {
+                network: route.network,
+                gateway_ip: route.gateway_ip,
+              }
+            end : []
+          }
+        end}"
         puts "#{ui.color('Availability Zone', :cyan)}: #{nodepool.properties.availability_zone}"
         puts "#{ui.color('Auto Scaling', :cyan)}: #{auto_scaling}"
         puts "#{ui.color('Maintenance Window', :cyan)}: #{maintenance_window}"

data/lib/chef/knife/ionoscloud_nodepool_delete.rb

@@ -36,11 +36,36 @@ class Chef
             next
           end
 
+          auto_scaling = "Min node count: #{nodepool.properties.auto_scaling.min_node_count}, Max node count:#{nodepool.properties.auto_scaling.max_node_count}"
+          maintenance_window = "#{nodepool.properties.maintenance_window.day_of_the_week}, #{nodepool.properties.maintenance_window.time}"
+
           msg_pair('ID', nodepool.id)
           msg_pair('Name', nodepool.properties.name)
           msg_pair('K8s Version', nodepool.properties.k8s_version)
           msg_pair('Datacenter ID', nodepool.properties.datacenter_id)
           msg_pair('Node Count', nodepool.properties.node_count)
+          msg_pair('CPU Family', nodepool.properties.cpu_family)
+          msg_pair('Cores Count', nodepool.properties.cores_count)
+          msg_pair('RAM', nodepool.properties.ram_size)
+          msg_pair('Storage Type', nodepool.properties.storage_type)
+          msg_pair('Storage Size', nodepool.properties.storage_size)
+          msg_pair('Lans', nodepool.properties.lans.map do
+            |lan|
+            {
+              id: lan.id,
+              dhcp: lan.dhcp,
+              routes: lan.routes ? lan.routes.map do
+                |route|
+                {
+                  network: route.network,
+                  gateway_ip: route.gateway_ip,
+                }
+              end : []
+            }
+          end)
+          msg_pair('Availability Zone', nodepool.properties.availability_zone)
+          msg_pair('Auto Scaling', auto_scaling)
+          msg_pair('Maintenance Window', maintenance_window)
           msg_pair('State', nodepool.metadata.state)
 
           puts "\n"

data/lib/chef/knife/ionoscloud_nodepool_lan_add.rb

@@ -0,0 +1,130 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudNodepoolLanAdd < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud nodepool lan add (options)'
+
+      option :cluster_id,
+              short: '-C CLUSTER_ID',
+              long: '--cluster-id CLUSTER_ID',
+              description: 'ID of the Kubernetes cluster'
+
+      option :nodepool_id,
+              short: '-N NODEPOOL_ID',
+              long: '--nodepool NODEPOOL_ID',
+              description: 'The ID of the K8s Nodepool'
+
+      option :lan_id,
+              short: '-L LAN_ID',
+              long: '--lan LAN_ID',
+              description: 'The ID of the LAN'
+
+      option :no_dhcp,
+              long: '--nodhcp',
+              boolean: true,
+              default: false,
+              description: 'Indicates if the Kubernetes Node Pool LAN will reserve an IP using DHCP'
+
+      option :routes,
+              long: '--routes NETWORK,GATEWAY_IP [NETWORK,GATEWAY_IP]',
+              description: 'An array of additional LANs attached to worker nodes'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'Adds or updates a LAN within a Nodepool.'
+        @required_options = [:cluster_id, :nodepool_id, :lan_id, :ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        validate_required_params(@required_options, config)
+
+        kubernetes_api = Ionoscloud::KubernetesApi.new(api_client)
+
+        begin
+          nodepool = kubernetes_api.k8s_nodepools_find_by_id(config[:cluster_id], config[:nodepool_id])
+        rescue Ionoscloud::ApiError => err
+          raise err unless err.code == 404
+          ui.error("Nodepool ID #{config[:nodepool_id]} not found.")
+          exit(1)
+        end
+
+        routes = []
+        config[:routes] = config[:routes].split(',') if config[:routes]
+        config[:routes].each_slice(2) do |network, gateway_ip|
+          routes << Ionoscloud::KubernetesNodePoolLanRoutes.new(
+            network: network,
+            gateway_ip: gateway_ip,
+          )
+        end
+
+        new_lan = Ionoscloud::KubernetesNodePoolLan.new(
+          id: Integer(config[:lan_id]),
+          dhcp: !config[:no_dhcp],
+          routes: routes,
+        )
+
+        puts new_lan
+
+        existing = nodepool.properties.lans.select { |lan| lan.id == new_lan.id }
+
+        new_nodepool = Ionoscloud::KubernetesNodePool.new(
+          properties: Ionoscloud::KubernetesNodePoolPropertiesForPut.new(
+            node_count: nodepool.properties.node_count,
+            k8s_version: nodepool.properties.k8s_version,
+            maintenance_window: nodepool.properties.maintenance_window,
+            auto_scaling: nodepool.properties.auto_scaling,
+            public_ips: nodepool.properties.public_ips,
+            lans: nodepool.properties.lans,
+          ),
+        )
+
+        new_nodepool.properties.lans = new_nodepool.properties.lans.delete_if { |lan| lan.id == new_lan.id }
+        new_nodepool.properties.lans << new_lan
+
+        nodepool = kubernetes_api.k8s_nodepools_put(
+          config[:cluster_id], config[:nodepool_id], new_nodepool,
+        )
+
+        if existing.length > 0
+          ui.info("Updating Lan #{config[:lan_id]} in the Nodepoool.")
+        else
+          ui.info("Adding Lan #{config[:lan_id]} to the Nodepoool.")
+        end
+
+        auto_scaling = "Min node count: #{nodepool.properties.auto_scaling.min_node_count}, Max node count:#{nodepool.properties.auto_scaling.max_node_count}"
+        maintenance_window = "#{nodepool.properties.maintenance_window.day_of_the_week}, #{nodepool.properties.maintenance_window.time}"
+
+        puts "\n"
+        puts "#{ui.color('ID', :cyan)}: #{nodepool.id}"
+        puts "#{ui.color('Name', :cyan)}: #{nodepool.properties.name}"
+        puts "#{ui.color('K8s Version', :cyan)}: #{nodepool.properties.k8s_version}"
+        puts "#{ui.color('Node Count', :cyan)}: #{nodepool.properties.node_count}"
+        puts "#{ui.color('Lans', :cyan)}: #{nodepool.properties.lans.map do
+          |lan|
+          {
+            id: lan.id,
+            dhcp: lan.dhcp,
+            routes: lan.routes ? lan.routes.map do
+              |route|
+              {
+                network: route.network,
+                gateway_ip: route.gateway_ip,
+              }
+            end : []
+          }
+        end}"
+        puts "#{ui.color('Auto Scaling', :cyan)}: #{auto_scaling}"
+        puts "#{ui.color('Maintenance Window', :cyan)}: #{maintenance_window}"
+        puts "#{ui.color('State', :cyan)}: #{nodepool.metadata.state}"
+        puts 'done'
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_nodepool_lan_remove.rb

@@ -0,0 +1,96 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudNodepoolLanRemove < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud nodepool lan remove LAN_ID [LAN_ID] (options)'
+
+      option :cluster_id,
+              short: '-C CLUSTER_ID',
+              long: '--cluster-id CLUSTER_ID',
+              description: 'ID of the Kubernetes cluster'
+
+      option :nodepool_id,
+              short: '-N NODEPOOL_ID',
+              long: '--nodepool NODEPOOL_ID',
+              description: 'The ID of the K8s Nodepool'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'Adds or updates a LAN within a Nodepool.'
+        @required_options = [:cluster_id, :nodepool_id, :ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        validate_required_params(@required_options, config)
+
+        kubernetes_api = Ionoscloud::KubernetesApi.new(api_client)
+
+        begin
+          nodepool = kubernetes_api.k8s_nodepools_find_by_id(config[:cluster_id], config[:nodepool_id])
+        rescue Ionoscloud::ApiError => err
+          raise err unless err.code == 404
+          ui.error("Nodepool ID #{config[:nodepool_id]} not found.")
+          exit(1)
+        end
+
+        existing = nodepool.properties.lans.select { |lan| @name_args.map { |id| Integer(id) }.include? lan.id }
+
+        if existing.length > 0
+          new_nodepool = Ionoscloud::KubernetesNodePool.new(
+            properties: Ionoscloud::KubernetesNodePoolPropertiesForPut.new(
+              node_count: nodepool.properties.node_count,
+              k8s_version: nodepool.properties.k8s_version,
+              maintenance_window: nodepool.properties.maintenance_window,
+              auto_scaling: nodepool.properties.auto_scaling,
+              public_ips: nodepool.properties.public_ips,
+              lans: nodepool.properties.lans,
+            ),
+          )
+          new_nodepool.properties.lans.delete_if { |lan| @name_args.map { |id| Integer(id) }.include? lan.id }
+
+          nodepool = kubernetes_api.k8s_nodepools_put(
+            config[:cluster_id], config[:nodepool_id], new_nodepool,
+          )
+
+          ui.info("Removing Lans #{@name_args} from the Nodepoool.")
+        else
+          ui.info("None of the specified Lan IDs (#{@name_args}) are present on the Nodepoool.")
+        end
+
+        auto_scaling = "Min node count: #{nodepool.properties.auto_scaling.min_node_count}, Max node count:#{nodepool.properties.auto_scaling.max_node_count}"
+        maintenance_window = "#{nodepool.properties.maintenance_window.day_of_the_week}, #{nodepool.properties.maintenance_window.time}"
+
+        puts "\n"
+        puts "#{ui.color('ID', :cyan)}: #{nodepool.id}"
+        puts "#{ui.color('Name', :cyan)}: #{nodepool.properties.name}"
+        puts "#{ui.color('K8s Version', :cyan)}: #{nodepool.properties.k8s_version}"
+        puts "#{ui.color('Node Count', :cyan)}: #{nodepool.properties.node_count}"
+        puts "#{ui.color('Lans', :cyan)}: #{nodepool.properties.lans.map do
+          |lan|
+          {
+            id: lan.id,
+            dhcp: lan.dhcp,
+            routes: lan.routes ? lan.routes.map do
+              |route|
+              {
+                network: route.network,
+                gateway_ip: route.gateway_ip,
+              }
+            end : []
+          }
+        end}"
+        puts "#{ui.color('Auto Scaling', :cyan)}: #{auto_scaling}"
+        puts "#{ui.color('Maintenance Window', :cyan)}: #{maintenance_window}"
+        puts "#{ui.color('State', :cyan)}: #{nodepool.metadata.state}"
+        puts 'done'
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_nodepool_list.rb

@@ -31,6 +31,7 @@ class Chef
           ui.color('K8s Version', :bold),
           ui.color('Datacenter ID', :bold),
           ui.color('Node Count', :bold),
+          ui.color('Lan Count', :bold),
           ui.color('State', :bold),
         ]
 
@@ -42,9 +43,10 @@ class Chef
           nodepool_list << nodepool.properties.k8s_version
           nodepool_list << nodepool.properties.datacenter_id
           nodepool_list << nodepool.properties.node_count.to_s
+          nodepool_list << nodepool.properties.lans.length
           nodepool_list << nodepool.metadata.state
         end
-        puts ui.list(nodepool_list, :uneven_columns_across, 6)
+        puts ui.list(nodepool_list, :uneven_columns_across, 7)
       end
     end
   end

data/lib/chef/knife/ionoscloud_pcc_create.rb

@@ -36,7 +36,7 @@ class Chef
 
         print "#{ui.color('Creating private cross connect...', :magenta)}"
 
-        pcc_api = Ionoscloud::PrivateCrossConnectApi.new(api_client)
+        pcc_api = Ionoscloud::PrivateCrossConnectsApi.new(api_client)
         config[:peers] = config[:peers].split(',') unless config[:peers].nil?
 
         if config[:peers] && config[:peers].length % 2 != 0
@@ -57,7 +57,7 @@ class Chef
         pcc = pcc_api.pccs_find_by_id(pcc.id)
 
         if config[:peers]
-          lan_api = Ionoscloud::LanApi.new(api_client)
+          lan_api = Ionoscloud::LansApi.new(api_client)
 
           header_list = []
           allowed_datacenters_ids = pcc.properties.connectable_datacenters.map { |datacenter| datacenter.id }