Advertisement
Guest User

Untitled

a guest
Sep 17th, 2019
127
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.77 KB | None | 0 0
  1. # patch kubernetes
  2. ```diff
  3. diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go
  4. index 39659a8..1706400 100644
  5. --- a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go
  6. +++ b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go
  7. @@ -30,6 +30,7 @@ import (
  8. "k8s.io/kubernetes/pkg/volume/csi"
  9. "k8s.io/kubernetes/pkg/volume/flexvolume"
  10. "k8s.io/kubernetes/pkg/volume/host_path"
  11. + "k8s.io/kubernetes/pkg/volume/glusterfs"
  12. "k8s.io/kubernetes/pkg/volume/iscsi"
  13. "k8s.io/kubernetes/pkg/volume/local"
  14. "k8s.io/kubernetes/pkg/volume/nfs"
  15. @@ -104,6 +105,7 @@ func ProbeControllerVolumePlugins(config kubectrlmgrconfig.VolumeConfiguration)
  16. klog.Fatalf("Could not create NFS recycler pod from file %s: %+v", config.PersistentVolumeRecyclerConfiguration.PodTemplateFilePathNFS, err)
  17. }
  18. allPlugins = append(allPlugins, nfs.ProbeVolumePlugins(nfsConfig)...)
  19. + allPlugins = append(allPlugins, glusterfs.ProbeVolumePlugins()...)
  20. allPlugins = append(allPlugins, local.ProbeVolumePlugins()...)
  21.  
  22. return allPlugins
  23. diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/plugins.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/plugins.go
  24. index d90911a..4dcb47c 100644
  25. --- a/vendor/k8s.io/kubernetes/cmd/kubelet/app/plugins.go
  26. +++ b/vendor/k8s.io/kubernetes/cmd/kubelet/app/plugins.go
  27. @@ -26,6 +26,7 @@ import (
  28. "k8s.io/kubernetes/pkg/volume/downwardapi"
  29. "k8s.io/kubernetes/pkg/volume/emptydir"
  30. "k8s.io/kubernetes/pkg/volume/flexvolume"
  31. + "k8s.io/kubernetes/pkg/volume/glusterfs"
  32. "k8s.io/kubernetes/pkg/volume/host_path"
  33. "k8s.io/kubernetes/pkg/volume/iscsi"
  34. "k8s.io/kubernetes/pkg/volume/local"
  35. @@ -52,6 +53,7 @@ func ProbeVolumePlugins() []volume.VolumePlugin {
  36. allPlugins = append(allPlugins, nfs.ProbeVolumePlugins(volume.VolumeConfig{})...)
  37. allPlugins = append(allPlugins, secret.ProbeVolumePlugins()...)
  38. allPlugins = append(allPlugins, iscsi.ProbeVolumePlugins()...)
  39. + allPlugins = append(allPlugins, glusterfs.ProbeVolumePlugins()...)
  40. allPlugins = append(allPlugins, downwardapi.ProbeVolumePlugins()...)
  41. allPlugins = append(allPlugins, configmap.ProbeVolumePlugins()...)
  42. allPlugins = append(allPlugins, projected.ProbeVolumePlugins()...)
  43. ```
  44.  
  45. # add vendor dependency (manually)
  46. ```
  47. vendor/github.com/asaskevich/
  48. vendor/github.com/dgrijalva/
  49. vendor/github.com/go-ozzo/
  50. vendor/github.com/heketi/
  51. vendor/k8s.io/kubernetes/pkg/volume/glusterfs/
  52. ```
  53.  
  54. # change container image base scratch to ubuntu (due to glusterfs not supported in alpine(musl))
  55. ```diff
  56. diff --git a/package/Dockerfile b/package/Dockerfile
  57. index 4d9a42e..e36b88b 100644
  58. --- a/package/Dockerfile
  59. +++ b/package/Dockerfile
  60. @@ -1,18 +1,21 @@
  61. -FROM alpine:3.10 as base
  62. -RUN apk add -U ca-certificates
  63. +FROM ubuntu:18.04
  64. ADD build/out/data.tar.gz /image
  65. -RUN mkdir -p /image/etc/ssl/certs /image/run /image/var/run /image/tmp /image/lib/modules /image/lib/firmware && \
  66. - cp /etc/ssl/certs/ca-certificates.crt /image/etc/ssl/certs/ca-certificates.crt
  67. -RUN cd image/bin && \
  68. +RUN chmod 1777 /tmp && \
  69. + cd image/bin && \
  70. rm -f k3s && \
  71. ln -s k3s-server k3s
  72. -
  73. -FROM scratch
  74. -COPY --from=base /image /
  75. -RUN chmod 1777 /tmp
  76. VOLUME /var/lib/rancher/k3s
  77. VOLUME /var/lib/cni
  78. VOLUME /var/log
  79. -ENV PATH="$PATH:/bin/aux"
  80. -ENTRYPOINT ["/bin/k3s"]
  81. +ENV PATH="$PATH:/image/bin:/bin/aux"
  82. +ENTRYPOINT ["/image/bin/k3s"]
  83. CMD ["agent"]
  84. +RUN apt-get update && apt-get -y install software-properties-common &&\
  85. + add-apt-repository ppa:gluster/glusterfs-4.1 &&\
  86. + apt-get update &&\
  87. + apt-get -y install glusterfs-client
  88. ```
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement