porkadot 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834e1f31cbbf8c7c8766162945572512fc0311dbf772df008f85ef2a00b3ea3d
-  data.tar.gz: f453e7a4899673f08a550b69c41b30c908eb5bf0906a67eee79a21ccd5fc1dcd
+  metadata.gz: dab74c5a6f0fd112b9ec994a67fe85c2bbe02c478ab68c95dcf8c998d9ddb64f
+  data.tar.gz: 272069efcb1b5bea219c54b4a4b0ec432bc215352fa786adcfc7923fdf73ae75
 SHA512:
-  metadata.gz: e13576f10e90eb2d277302bfcfe7cecb7feb681d25070052c50b6060b95e0b455061d093d8ddde84a69c650e2fa6f2b3775e25913cf743023c2ee036bdef0764
-  data.tar.gz: 5714fefdd57b9683974ea42f6d111ac87b66f723221f5f0852c95b758d92cf19f6eac32c9ddd2e98e1f77dcbac4db70c735eddf4999cb39be71ad2717efb5d5d
+  metadata.gz: eea11e276a5d6d95b231f3dce02b36eeb040533902c03202273b66ac1ad1d6dbe52349a0a5bfc6a69e0a5cf920dee49e871dcc2b8174c5e2ea3c8460fff4ec67
+  data.tar.gz: fa3c81ddc0dc1330ad4ea579b27557bd7316b3ccec0f1cd08c11a1cd107ecb4a2b472d71502811e88addd185a72f7b5b1fd0355ded8929a6a1de0299054d1778

data/lib/porkadot/assets/kubernetes.rb

@@ -40,6 +40,7 @@ module Porkadot; module Assets
       render_secrets_erb "manifests/kube-controller-manager.secrets.yaml"
       render_erb "manifests/kubelet-rubber-stamp.yaml"
       render_erb "manifests/storage-version-migrator.yaml"
+      render_secrets_erb "kubeconfig.yaml"
       render_erb 'install.sh'
     end
 

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

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: kubernetes
+  cluster:
+    certificate-authority-data: <%= certs.kubernetes.to_base64(:ca_cert) %>
+    server: https://127.0.0.1:<%= global_config.k8s.apiserver.bind_port %>
+users:
+- name: admin
+  user:
+    client-certificate-data: <%= certs.kubernetes.to_base64(:client_cert) %>
+    client-key-data: <%= certs.kubernetes.to_base64(:client_key) %>
+contexts:
+- context:
+    cluster: kubernetes
+    user: admin
+  name: admin-context
+current-context: admin-context
+

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

@@ -166,7 +166,7 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni
-        image: quay.io/coreos/flannel:v0.13.0
+        image: quay.io/coreos/flannel:v0.14.0
         command:
         - cp
         args:
@@ -180,7 +180,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-        image: quay.io/coreos/flannel:v0.13.0
+        image: quay.io/coreos/flannel:v0.14.0
         command:
         - /opt/bin/flanneld
         args:

data/lib/porkadot/assets/kubernetes/manifests/kube-apiserver.secrets.yaml.erb

@@ -11,6 +11,7 @@ data:
   kubelet-client.crt: <%= certs.kubernetes.to_base64(:kubelet_client_cert) %>
   kubelet-client.key: <%= certs.kubernetes.to_base64(:kubelet_client_key) %>
   sa.pub: <%= certs.kubernetes.to_base64(:sa_public_key) %>
+  sa.key: <%= certs.kubernetes.to_base64(:sa_private_key) %>
 kind: Secret
 metadata:
   name: kube-apiserver

data/lib/porkadot/configs/kubernetes.rb

@@ -128,7 +128,9 @@ module Porkadot; module Configs
           --requestheader-group-headers=X-Remote-Group
           --requestheader-username-headers=X-Remote-User
           --secure-port=#{self.bind_port}
+          --service-account-issuer=https://kubernetes.default.svc#{self.config.k8s.networking.dns_domain}
           --service-account-key-file=/etc/kubernetes/pki/kubernetes/sa.pub
+          --service-account-signing-key-file=/etc/kubernetes/pki/kubernetes/sa.key
           --service-cluster-ip-range=#{config.k8s.networking.service_subnet}
           --storage-backend=etcd3
           --tls-cert-file=/etc/kubernetes/pki/kubernetes/apiserver.crt

data/lib/porkadot/default.yaml

@@ -27,11 +27,11 @@ lb:
 
 etcd:
   image_repository: gcr.io/etcd-development/etcd
-  image_tag: v3.4.3
+  image_tag: v3.4.13
   extra_env: []
 
 kubernetes:
-  kubernetes_version: v1.19.6
+  kubernetes_version: v1.20.3
   image_repository: k8s.gcr.io
 
   networking:

data/lib/porkadot/install/kubernetes.rb

@@ -26,7 +26,8 @@ module Porkadot; module Install
         upload! config.target_secrets_path, KUBE_SECRETS_TEMP, recursive: true
         execute(:cp, '-r', KUBE_SECRETS_TEMP + '/*', KUBE_TEMP)
 
-        as user: 'root' do
+        # as user: 'root' do
+        with KUBECONFIG: File.join(KUBE_TEMP, 'kubeconfig.yaml') do
           execute(:bash, File.join(KUBE_TEMP, 'install.sh'))
         end
       end

data/lib/porkadot/version.rb

@@ -1,3 +1,3 @@
 module Porkadot
-  VERSION = "0.19.1"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: porkadot
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - OTSUKA, Yuanying
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -143,6 +143,7 @@ files:
 - lib/porkadot/assets/kubelet/setup-containerd.sh.erb
 - lib/porkadot/assets/kubernetes.rb
 - lib/porkadot/assets/kubernetes/install.sh.erb
+- lib/porkadot/assets/kubernetes/kubeconfig.yaml.erb
 - lib/porkadot/assets/kubernetes/manifests/coredns.yaml.erb
 - lib/porkadot/assets/kubernetes/manifests/dns-horizontal-autoscaler.yaml.erb
 - lib/porkadot/assets/kubernetes/manifests/flannel.yaml.erb