From f14f21e6644e64e06f7a4f2019c927d09ec60728 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 27 Oct 2019 05:32:26 +0100 Subject: [PATCH 1/8] Simplify registry access by not requiring direct access to minio https://docs.docker.com/registry/configuration/#redirect --- registry/generic,minio/deployment.yaml | 2 ++ registry/generic,minio/kustomization.yaml | 1 - registry/generic,minio/minio-host-from-nodes.yaml | 15 --------------- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 registry/generic,minio/minio-host-from-nodes.yaml diff --git a/registry/generic,minio/deployment.yaml b/registry/generic,minio/deployment.yaml index 0eff04b3..b177ceba 100644 --- a/registry/generic,minio/deployment.yaml +++ b/registry/generic,minio/deployment.yaml @@ -26,3 +26,5 @@ spec: value: us-east-1 - name: REGISTRY_STORAGE_S3_BUCKET value: ystack-builds-registry + - name: REGISTRY_STORAGE_REDIRECT_DISABLE + value: "true" diff --git a/registry/generic,minio/kustomization.yaml b/registry/generic,minio/kustomization.yaml index 95b3a002..356840cd 100644 --- a/registry/generic,minio/kustomization.yaml +++ b/registry/generic,minio/kustomization.yaml @@ -3,4 +3,3 @@ bases: - ../node-update-hosts patchesStrategicMerge: - deployment.yaml -- minio-host-from-nodes.yaml diff --git a/registry/generic,minio/minio-host-from-nodes.yaml b/registry/generic,minio/minio-host-from-nodes.yaml deleted file mode 100644 index 0687ed41..00000000 --- a/registry/generic,minio/minio-host-from-nodes.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: registry-etc-hosts-update -spec: - template: - spec: - initContainers: - - name: update - env: - - name: REGISTRY_SERVICE_HOSTS - value: >- - builds-registry.ystack.svc.cluster.local - prod-registry.ystack.svc.cluster.local - blobs-minio.ystack.svc.cluster.local From 2e9731f0f27d57e598ca4121fc7bfb8523b8369b Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 27 Oct 2019 10:39:00 +0100 Subject: [PATCH 2/8] Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of betas --- bin/y-cluster-provision-k3s-multipass | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/bin/y-cluster-provision-k3s-multipass b/bin/y-cluster-provision-k3s-multipass index 9b2063db..e0a7706b 100755 --- a/bin/y-cluster-provision-k3s-multipass +++ b/bin/y-cluster-provision-k3s-multipass @@ -31,8 +31,8 @@ export INSTALL_K3S_SKIP_START=true # For kubectl top to work with metrics-server, https://github.com/rancher/k3s/issues/252#issuecomment-482662774 export INSTALL_K3S_EXEC="--kubelet-arg=address=0.0.0.0" -INSTALLER_REVISION=d8c4f3811e96d75f82bebc82f4ef8f82fbe70637 -export INSTALL_K3S_VERSION=v0.8.1 +INSTALLER_REVISION=e810ee1678dc59ed35970734e69a5b31b5773550 +export INSTALL_K3S_VERSION=v0.10.1-rc1 curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh - K3S_DATA_DIR=/var/lib/rancher/k3s @@ -65,23 +65,14 @@ k3s crictl info chmod a+r /etc/rancher/k3s/* -k3s kubectl apply -f https://raw.githubusercontent.com/rancher/local-path-provisioner/v0.0.9/deploy/local-path-storage.yaml -cat << EOF | k3s kubectl create -f - -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: standard -provisioner: rancher.io/local-path -volumeBindingMode: WaitForFirstConsumer -reclaimPolicy: Delete -EOF -k3s kubectl patch storageclass standard -p "{\"metadata\":{\"annotations\":{\"storageclass.kubernetes.io/is-default-class\":\"true\"}}}" +# The default storage class with k3s >= 0.10 is "local-path" +#k3s kubectl patch storageclass standard -p "{\"metadata\":{\"annotations\":{\"storageclass.kubernetes.io/is-default-class\":\"true\"}}}" k3s kubectl get node k3s kubectl wait --for=condition=Ready node/ystack-master '; multipass exec "$VM_NAME" -- sudo cat /etc/rancher/k3s/k3s.yaml \ - | sed "s|localhost|$K3S_NODEIP_MASTER|" \ + | sed "s|127.0.0.1|$K3S_NODEIP_MASTER|" \ > "$KUBECONFIG.tmp" KUBECONFIG="$KUBECONFIG.tmp" kubectl config rename-context default ystack-k3s From 010f778728a6579537868212c97e0f313d4cf55c Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 27 Oct 2019 11:15:30 +0100 Subject: [PATCH 3/8] Configures local registry through rancher/k3s#867 --- bin/y-cluster-provision-k3s-multipass | 36 ++++++++------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/bin/y-cluster-provision-k3s-multipass b/bin/y-cluster-provision-k3s-multipass index e0a7706b..9c6c9419 100755 --- a/bin/y-cluster-provision-k3s-multipass +++ b/bin/y-cluster-provision-k3s-multipass @@ -31,35 +31,21 @@ export INSTALL_K3S_SKIP_START=true # For kubectl top to work with metrics-server, https://github.com/rancher/k3s/issues/252#issuecomment-482662774 export INSTALL_K3S_EXEC="--kubelet-arg=address=0.0.0.0" +mkdir -p /etc/rancher/k3s +cat <> /etc/rancher/k3s/registries.yaml +mirrors: + "builds-registry.ystack.svc.cluster.local": + endpoint: + - http://builds-registry.ystack.svc.cluster.local + "prod-registry.ystack.svc.cluster.local": + endpoint: + - http://prod-registry.ystack.svc.cluster.local +EOF + INSTALLER_REVISION=e810ee1678dc59ed35970734e69a5b31b5773550 export INSTALL_K3S_VERSION=v0.10.1-rc1 curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh - -K3S_DATA_DIR=/var/lib/rancher/k3s - -# https://github.com/rancher/k3s/issues/145 -# https://github.com/rancher/k3s/blob/master/pkg/agent/templates/templates.go -mkdir -p $K3S_DATA_DIR/agent/etc/containerd -cat <> $K3S_DATA_DIR/agent/etc/containerd/config.toml.tmpl -[plugins.opt] -path = "{{ .NodeConfig.Containerd.Opt }}" - -[plugins.cri] - stream_server_address = "{{ .NodeConfig.AgentConfig.NodeName }}" - stream_server_port = "10010" - - [plugins.cri.cni] - bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}" - conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}" - - [plugins.cri.registry] - [plugins.cri.registry.mirrors] - [plugins.cri.registry.mirrors."builds-registry.ystack.svc.cluster.local"] - endpoint = ["http://builds-registry.ystack.svc.cluster.local"] - [plugins.cri.registry.mirrors."prod-registry.ystack.svc.cluster.local"] - endpoint = ["http://prod-registry.ystack.svc.cluster.local"] -EOF - service k3s start k3s crictl info From ca0c64ec5abe4493694e0713f10656e02083fba0 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 27 Oct 2019 11:22:29 +0100 Subject: [PATCH 4/8] Bumps metrics-server to v0.3.6 --- metrics-server/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrics-server/kustomization.yaml b/metrics-server/kustomization.yaml index 1500f55f..0cb0749a 100644 --- a/metrics-server/kustomization.yaml +++ b/metrics-server/kustomization.yaml @@ -1,6 +1,6 @@ namespace: kube-system bases: -- github.com/y-stack/metrics-server/deploy/1.8+?ref=54b14b78112367c01576f34fc34b3aa33c3098c6 +- github.com/y-stack/metrics-server/deploy/1.8+?ref=e9bcc0e8d9de4d4b9d1dbc62a736733577f4a3de patchesStrategicMerge: - resource-limits.yaml - metric-resolution.yaml \ No newline at end of file From 749310bc8b96efcea8fe91d835a1e2648d316a35 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 27 Oct 2019 11:29:07 +0100 Subject: [PATCH 5/8] Commenting out the more frequent metric updates now but keeping resource limits, as a new way of approaching y-stack/ystack#5 I'm thinking that delayed metrics is better than no metrics, and I did have working kubectl top now on a fresh cluster. --- metrics-server/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrics-server/kustomization.yaml b/metrics-server/kustomization.yaml index 0cb0749a..4cd0f64d 100644 --- a/metrics-server/kustomization.yaml +++ b/metrics-server/kustomization.yaml @@ -3,4 +3,4 @@ bases: - github.com/y-stack/metrics-server/deploy/1.8+?ref=e9bcc0e8d9de4d4b9d1dbc62a736733577f4a3de patchesStrategicMerge: - resource-limits.yaml -- metric-resolution.yaml \ No newline at end of file +#- metric-resolution.yaml From 250801af213928da9b93b23625c27f536dbf45f7 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 27 Oct 2019 16:01:42 +0100 Subject: [PATCH 6/8] Automatic volume provisioning on k3s 0.10+ through default storage class: Yolean/kubernetes-kafka#294 --- kafka/kustomization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kafka/kustomization.yaml b/kafka/kustomization.yaml index a3f96e00..bf5d0033 100644 --- a/kafka/kustomization.yaml +++ b/kafka/kustomization.yaml @@ -1,4 +1,4 @@ namespace: kafka bases: -- github.com/Yolean/kubernetes-kafka/variants/dev-small?ref=f30ecd9469f531b40d00fd5e2b35fb0faa3a6c31 -- github.com/Yolean/kubernetes-kafka/pixy?ref=f30ecd9469f531b40d00fd5e2b35fb0faa3a6c31 +- github.com/Yolean/kubernetes-kafka/variants/dev-small?ref=56048238fe102c937243d2676dce753265eeb767 +- github.com/Yolean/kubernetes-kafka/pixy?ref=56048238fe102c937243d2676dce753265eeb767 From f567870893303554721f314cac85e0f0418eb00e Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 27 Oct 2019 16:13:22 +0100 Subject: [PATCH 7/8] Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294 --- kafka/kustomization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kafka/kustomization.yaml b/kafka/kustomization.yaml index bf5d0033..56da9b72 100644 --- a/kafka/kustomization.yaml +++ b/kafka/kustomization.yaml @@ -1,4 +1,4 @@ namespace: kafka bases: -- github.com/Yolean/kubernetes-kafka/variants/dev-small?ref=56048238fe102c937243d2676dce753265eeb767 -- github.com/Yolean/kubernetes-kafka/pixy?ref=56048238fe102c937243d2676dce753265eeb767 +- github.com/Yolean/kubernetes-kafka/variants/dev-small?ref=2927b49281a748894368ef0e9f5c83df8259ca40 +- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40 From 2b83dc5110294433a3ddf3653412a1b5ead43339 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Tue, 12 Nov 2019 15:03:23 +0100 Subject: [PATCH 8/8] k3s 0.10.2 --- bin/y-cluster-provision-k3s-multipass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/y-cluster-provision-k3s-multipass b/bin/y-cluster-provision-k3s-multipass index 9c6c9419..03808d78 100755 --- a/bin/y-cluster-provision-k3s-multipass +++ b/bin/y-cluster-provision-k3s-multipass @@ -42,8 +42,8 @@ mirrors: - http://prod-registry.ystack.svc.cluster.local EOF -INSTALLER_REVISION=e810ee1678dc59ed35970734e69a5b31b5773550 -export INSTALL_K3S_VERSION=v0.10.1-rc1 +INSTALLER_REVISION=8833bfd961ff31b7b6de4300b201d01d3fb2bac8 +export INSTALL_K3S_VERSION=v0.10.2 curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh - service k3s start