porkadot 0.26.1 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e5c0269ae966cbbcd72c86d39866a5d874b7a1f378d6018bda26f08fd6e22b
-  data.tar.gz: 930b94aee3c8d0bca8dec896e8a0c85d447cb64ebd6d1bdf297c38df0dbce55f
+  metadata.gz: 7c578c835b4a0d89d55ccb28da3bbad3b44c13be16dbd1e0cbba6dba9acaa2c4
+  data.tar.gz: ceb7aa6d886d2fa6063ed398ae3db3412605d5218bb75f566eea0bbbe0d6fa59
 SHA512:
-  metadata.gz: 64423d83c7c1667e5d5fcbb1ac25f051d787ab84a1e11543f9f3296c50385c498cb4087a5b5bcc3c7d8e54942c9242fecd8be971882c1841bbbe7883627397c6
-  data.tar.gz: 34b302eba12e397621deb13cdb13011136bcf78a53b0ebbadaa58a97658410b94845d72c1314da672886b696191bd3e507fa4350d05f0c8bb0cca42c2b3f58d4
+  metadata.gz: a5fd7693d6472b4fe004673c61d49b8b400486f53bd23080b5bc11df5096a325d9a4808903ad4658c90d04e8af0596678f23108e6d73cd9838025c3dcb0323ed
+  data.tar.gz: 9b07549ee7852517cce40a5f7f143799f937015b12d70b6257e9638aad13ffb57507670e75a6bffd9db124aaeebf2c7908a735ee37da2e7b5e145b9177328982

data/lib/porkadot/assets/kubelet-default/install-deps.sh.erb

@@ -17,13 +17,13 @@ RELEASE="<%= global_config.k8s.kubernetes_version %>"
 
 mkdir -p /opt/bin
 
-curl -L https://storage.googleapis.com/kubernetes-release/release/${RELEASE}/bin/linux/${architecture}/kubectl \
+curl -L https://dl.k8s.io/${RELEASE}/bin/linux/${architecture}/kubectl \
   -o /opt/bin/kubectl-${RELEASE}
 chmod +x /opt/bin/kubectl-${RELEASE}
 rm -f /opt/bin/kubectl
 ln -s /opt/bin/kubectl-${RELEASE} /opt/bin/kubectl
 
-curl -L https://storage.googleapis.com/kubernetes-release/release/${RELEASE}/bin/linux/${architecture}/kubelet \
+curl -L https://dl.k8s.io/${RELEASE}/bin/linux/${architecture}/kubelet \
   -o /opt/bin/kubelet-${RELEASE}
 chmod +x /opt/bin/kubelet-${RELEASE}
 rm -f /opt/bin/kubelet

data/lib/porkadot/assets/kubernetes/install.sh.erb

@@ -5,12 +5,18 @@ export LC_ALL=C
 ROOT=$(dirname "${BASH_SOURCE}")
 KUBECTL_OPTS=${KUBECTL_OPTS:-""}
 
-KUBECTL_OPTS="${KUBECTL_OPTS} --prune"
-KUBECTL_OPTS="${KUBECTL_OPTS} -l kubernetes.unstable.cloud/installed-by=porkadot"
-<%- prune_allowlist.each do |a| -%>
-KUBECTL_OPTS="${KUBECTL_OPTS} --prune-allowlist=<%= a %>"
-<%- end -%>
+KUBE_TARGET=${KUBE_TARGET:-""}
+
+if [ -n "${KUBE_TARGET}" ]; then
+  KUBECTL_OPTS="${KUBECTL_OPTS} -l=app.kubernetes.io/component=${KUBE_TARGET}"
+else
+  KUBECTL_OPTS="${KUBECTL_OPTS} --prune"
+  KUBECTL_OPTS="${KUBECTL_OPTS} -l kubernetes.unstable.cloud/installed-by=porkadot"
+  <%- prune_allowlist.each do |a| -%>
+  KUBECTL_OPTS="${KUBECTL_OPTS} --prune-allowlist=<%= a %>"
+  <%- end -%>
+  /opt/bin/kubectl apply --force-conflicts --server-side -R -f ${ROOT}/manifests/crds
+  /opt/bin/kubectl wait --for condition=established --timeout=60s crd --all
+fi
 
-/opt/bin/kubectl apply --force-conflicts --server-side -R -f ${ROOT}/manifests/crds
-/opt/bin/kubectl wait --for condition=established --timeout=60s crd --all
 /opt/bin/kubectl apply ${KUBECTL_OPTS} -k ${ROOT}

data/lib/porkadot/assets/kubernetes/manifests/porkadot.yaml.erb

@@ -6,6 +6,10 @@ metadata:
   annotations:
   labels:
     provider: porkadot
+    app.kubernetes.io/component: kube-apiserver
+    app.kubernetes.io/managed-by: porkadot
+    app.kubernetes.io/name: kube-apiserver
+    app.kubernetes.io/part-of: kubernetes
   name: porkadot-kubernetes
   namespace: kube-system
 spec:
@@ -28,6 +32,10 @@ metadata:
   annotations:
   labels:
     provider: porkadot
+    app.kubernetes.io/component: kube-apiserver
+    app.kubernetes.io/managed-by: porkadot
+    app.kubernetes.io/name: kube-apiserver
+    app.kubernetes.io/part-of: kubernetes
   name: porkadot-kubernetes-latest
   namespace: kube-system
 spec:

data/lib/porkadot/cmd/install/kubernetes.rb

@@ -0,0 +1,66 @@
+
+module Porkadot; module Cmd; module Install; module Kubernetes
+  class Cli < Porkadot::SubCommandBase
+    include Porkadot::Utils
+
+    def initialize(*arg)
+      super
+    end
+
+    no_commands do
+      def install target=''
+        kubelets = Porkadot::Install::KubeletList.new(self.config)
+        if node = options[:node]
+          nodes = kubelets[node]
+        else
+          nodes = Porkadot::Install::Bootstrap.new(self.config).host
+        end
+        k8s = Porkadot::Install::Kubernetes.new(self.config)
+        k8s.install(nodes, target)
+        ""
+      end
+    end
+
+    default_task :all
+    desc "all", "Install all components"
+    option :node, type: :string
+    def all
+      logger.info "Installing kubernetes"
+      self.install
+    end
+
+    desc "apiserver", "Install apiserver"
+    option :node, type: :string
+    def apiserver
+      logger.info "Installing kube-apiserver"
+      self.install 'kube-apiserver'
+    end
+
+    desc "controller-manager", "Install controller-manager"
+    option :node, type: :string
+    def controller_manager
+      logger.info "Installing kube-controller-manager"
+      self.install 'kube-controller-manager'
+    end
+
+    desc "scheduler", "Install scheduler"
+    option :node, type: :string
+    def scheduler
+      logger.info "Installing kube-scheduler"
+      self.install 'kube-scheduler'
+    end
+
+    desc "proxy", "Install proxy"
+    option :node, type: :string
+    def proxy
+      logger.info "Installing kube-proxy"
+      self.install 'kube-proxy'
+    end
+
+    def self.subcommand_prefix
+      'install kubernetes'
+    end
+  end
+
+end; end; end; end
+

data/lib/porkadot/cmd/install.rb

@@ -27,19 +27,7 @@ module Porkadot; module Cmd; module Install
     end
 
     desc "kubernetes", "Install kubernetes"
-    option :node, type: :string
-    def kubernetes
-      logger.info "Installing kubernetes"
-      kubelets = Porkadot::Install::KubeletList.new(self.config)
-      if node = options[:node]
-        nodes = kubelets[node]
-      else
-        nodes = Porkadot::Install::Bootstrap.new(self.config).host
-      end
-      k8s = Porkadot::Install::Kubernetes.new(self.config)
-      k8s.install(nodes)
-      ""
-    end
+    subcommand "kubernetes", Porkadot::Cmd::Install::Kubernetes::Cli
 
     desc "bootstrap", "Install bootstrap components"
     subcommand "bootstrap", Porkadot::Cmd::Install::Bootstrap::Cli

data/lib/porkadot/default.yaml

@@ -45,16 +45,16 @@ addons:
 
 etcd:
   image_repository: registry.k8s.io/etcd
-  image_tag: 3.5.5-0
+  image_tag: 3.5.12-0
   extra_env: []
 
 kubernetes:
-  kubernetes_version: v1.26.15
-  crictl_version: v1.26.0
+  kubernetes_version: v1.28.10
+  crictl_version: v1.28.0
   image_repository: registry.k8s.io
 
   networking:
-    cni_version: v1.2.0
+    cni_version: v1.4.1
     service_subnet: '10.254.0.0/24'
     pod_subnet: '10.244.0.0/16'
     dns_domain: 'cluster.local'

data/lib/porkadot/install/kubernetes.rb

@@ -13,7 +13,7 @@ module Porkadot; module Install
       @logger = global_config.logger
     end
 
-    def install host
+    def install host, target=''
       # global_config = self.global_config
       config = self.config
       on(host) do |host|
@@ -26,9 +26,12 @@ module Porkadot; module Install
         upload! config.target_secrets_path, KUBE_SECRETS_TEMP, recursive: true
 
         # as user: 'root' do
-        with KUBECONFIG: File.join(KUBE_SECRETS_TEMP, 'kubeconfig.yaml') do
-          execute(:bash, File.join(KUBE_SECRETS_TEMP, 'install.secrets.sh'))
-          execute(:bash, File.join(KUBE_TEMP, 'install.sh'))
+        with KUBE_TARGET: target do
+          with KUBECONFIG: File.join(KUBE_SECRETS_TEMP, 'kubeconfig.yaml') do
+            execute(:bash, File.join(KUBE_SECRETS_TEMP, 'install.secrets.sh'))
+            # execute(:bash, File.join(KUBE_TEMP, 'install.sh'), interaction_handler: SSHKit::MappingInteractionHandler.new({}, :info))
+            info capture(:bash, File.join(KUBE_TEMP, 'install.sh'))
+          end
         end
       end
     end

data/lib/porkadot/version.rb

@@ -1,3 +1,3 @@
 module Porkadot
-  VERSION = "0.26.1"
+  VERSION = "0.28.0"
 end

data/lib/porkadot.rb

@@ -37,6 +37,7 @@ require 'porkadot/install/bootstrap'
 require 'porkadot/cmd/render/certs'
 require 'porkadot/cmd/render'
 require 'porkadot/cmd/install/bootstrap'
+require 'porkadot/cmd/install/kubernetes'
 require 'porkadot/cmd/install'
 require 'porkadot/cmd/etcd'
 require 'porkadot/cmd'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: porkadot
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.28.0
 platform: ruby
 authors:
 - OTSUKA, Yuanying
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-12 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -200,6 +200,7 @@ files:
 - lib/porkadot/cmd/etcd.rb
 - lib/porkadot/cmd/install.rb
 - lib/porkadot/cmd/install/bootstrap.rb
+- lib/porkadot/cmd/install/kubernetes.rb
 - lib/porkadot/cmd/render.rb
 - lib/porkadot/cmd/render/certs.rb
 - lib/porkadot/config.rb