Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solsson merged 9 commits into from
Nov 12, 2019
Merged

Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f14f21e
Simplify registry access by not requiring direct access to minio
solsson Oct 27, 2019
2e9731f
Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of b…
solsson Oct 27, 2019
010f778
Configures local registry through rancher/k3s#867
solsson Oct 27, 2019
ca0c64e
Bumps metrics-server to v0.3.6
solsson Oct 27, 2019
749310b
Commenting out the more frequent metric updates now
solsson Oct 27, 2019
6e5ea61
Merge branch 'registry-performance' into kubernetesone16
solsson Oct 27, 2019
250801a
Automatic volume provisioning on k3s 0.10+
solsson Oct 27, 2019
f567870
Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294
solsson Oct 27, 2019
2b83dc5
k3s 0.10.2
solsson Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 16 additions & 39 deletions bin/y-cluster-provision-k3s-multipass
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,57 +31,34 @@ 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
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 <<EOF >> $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"]
mkdir -p /etc/rancher/k3s
cat <<EOF >> /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=8833bfd961ff31b7b6de4300b201d01d3fb2bac8
export INSTALL_K3S_VERSION=v0.10.2
curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh -

service k3s start
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
Expand Down
4 changes: 2 additions & 2 deletions kafka/kustomization.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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=2927b49281a748894368ef0e9f5c83df8259ca40
- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40
4 changes: 2 additions & 2 deletions metrics-server/kustomization.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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
#- metric-resolution.yaml
2 changes: 2 additions & 0 deletions registry/generic,minio/deployment.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
1 change: 0 additions & 1 deletion registry/generic,minio/kustomization.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,3 @@ bases:
- ../node-update-hosts
patchesStrategicMerge:
- deployment.yaml
- minio-host-from-nodes.yaml
15 changes: 0 additions & 15 deletions registry/generic,minio/minio-host-from-nodes.yaml
View file
Open in desktop

This file was deleted.

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

solsson
merged 9 commits into

from

Nov 12, 2019
 Merged


Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f14f21e

Simplify registry access by not requiring direct access to minio


solsson Oct 27, 2019
2e9731f

Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of b…


solsson Oct 27, 2019
010f778

Configures local registry through rancher/k3s#867


solsson Oct 27, 2019
ca0c64e

Bumps metrics-server to v0.3.6


solsson Oct 27, 2019
749310b

Commenting out the more frequent metric updates now


solsson Oct 27, 2019
6e5ea61

Merge branch 'registry-performance' into kubernetesone16


solsson Oct 27, 2019
250801a

Automatic volume provisioning on k3s 0.10+


solsson Oct 27, 2019
f567870

Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294


solsson Oct 27, 2019
2b83dc5

k3s 0.10.2


solsson Nov 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 16 additions & 39 deletions
bin/y-cluster-provision-k3s-multipass

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,57 +31,34 @@ 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
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 <<EOF >> $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"]
mkdir -p /etc/rancher/k3s
cat <<EOF >> /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=8833bfd961ff31b7b6de4300b201d01d3fb2bac8
export INSTALL_K3S_VERSION=v0.10.2
curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh -

service k3s start
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
Expand Down

4 changes: 2 additions & 2 deletions
kafka/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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=2927b49281a748894368ef0e9f5c83df8259ca40
- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40

4 changes: 2 additions & 2 deletions
metrics-server/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
#- metric-resolution.yaml

2 changes: 2 additions & 0 deletions
registry/generic,minio/deployment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

1 change: 0 additions & 1 deletion
registry/generic,minio/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,3 @@ bases:
- ../node-update-hosts
patchesStrategicMerge:
- deployment.yaml
- minio-host-from-nodes.yaml

15 changes: 0 additions & 15 deletions
registry/generic,minio/minio-host-from-nodes.yaml

View file


Open in desktop


This file was deleted.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

solsson
merged 9 commits into

from

Nov 12, 2019
 Merged


Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f14f21e

Simplify registry access by not requiring direct access to minio


solsson Oct 27, 2019
2e9731f

Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of b…


solsson Oct 27, 2019
010f778

Configures local registry through rancher/k3s#867


solsson Oct 27, 2019
ca0c64e

Bumps metrics-server to v0.3.6


solsson Oct 27, 2019
749310b

Commenting out the more frequent metric updates now


solsson Oct 27, 2019
6e5ea61

Merge branch 'registry-performance' into kubernetesone16


solsson Oct 27, 2019
250801a

Automatic volume provisioning on k3s 0.10+


solsson Oct 27, 2019
f567870

Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294


solsson Oct 27, 2019
2b83dc5

k3s 0.10.2


solsson Nov 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 16 additions & 39 deletions
bin/y-cluster-provision-k3s-multipass

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,57 +31,34 @@ 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
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 <<EOF >> $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"]
mkdir -p /etc/rancher/k3s
cat <<EOF >> /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=8833bfd961ff31b7b6de4300b201d01d3fb2bac8
export INSTALL_K3S_VERSION=v0.10.2
curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh -

service k3s start
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
Expand Down

4 changes: 2 additions & 2 deletions
kafka/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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=2927b49281a748894368ef0e9f5c83df8259ca40
- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40

4 changes: 2 additions & 2 deletions
metrics-server/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
#- metric-resolution.yaml

2 changes: 2 additions & 0 deletions
registry/generic,minio/deployment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

1 change: 0 additions & 1 deletion
registry/generic,minio/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,3 @@ bases:
- ../node-update-hosts
patchesStrategicMerge:
- deployment.yaml
- minio-host-from-nodes.yaml

15 changes: 0 additions & 15 deletions
registry/generic,minio/minio-host-from-nodes.yaml

View file


Open in desktop


This file was deleted.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

solsson
merged 9 commits into

from

Nov 12, 2019
 Merged


Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f14f21e

Simplify registry access by not requiring direct access to minio


solsson Oct 27, 2019
2e9731f

Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of b…


solsson Oct 27, 2019
010f778

Configures local registry through rancher/k3s#867


solsson Oct 27, 2019
ca0c64e

Bumps metrics-server to v0.3.6


solsson Oct 27, 2019
749310b

Commenting out the more frequent metric updates now


solsson Oct 27, 2019
6e5ea61

Merge branch 'registry-performance' into kubernetesone16


solsson Oct 27, 2019
250801a

Automatic volume provisioning on k3s 0.10+


solsson Oct 27, 2019
f567870

Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294


solsson Oct 27, 2019
2b83dc5

k3s 0.10.2


solsson Nov 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 16 additions & 39 deletions
bin/y-cluster-provision-k3s-multipass

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,57 +31,34 @@ 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
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 <<EOF >> $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"]
mkdir -p /etc/rancher/k3s
cat <<EOF >> /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=8833bfd961ff31b7b6de4300b201d01d3fb2bac8
export INSTALL_K3S_VERSION=v0.10.2
curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh -

service k3s start
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
Expand Down

4 changes: 2 additions & 2 deletions
kafka/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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=2927b49281a748894368ef0e9f5c83df8259ca40
- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40

4 changes: 2 additions & 2 deletions
metrics-server/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
#- metric-resolution.yaml

2 changes: 2 additions & 0 deletions
registry/generic,minio/deployment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

1 change: 0 additions & 1 deletion
registry/generic,minio/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,3 @@ bases:
- ../node-update-hosts
patchesStrategicMerge:
- deployment.yaml
- minio-host-from-nodes.yaml

15 changes: 0 additions & 15 deletions
registry/generic,minio/minio-host-from-nodes.yaml

View file


Open in desktop


This file was deleted.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

solsson
merged 9 commits into

from

Nov 12, 2019
 Merged


Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f14f21e

Simplify registry access by not requiring direct access to minio


solsson Oct 27, 2019
2e9731f

Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of b…


solsson Oct 27, 2019
010f778

Configures local registry through rancher/k3s#867


solsson Oct 27, 2019
ca0c64e

Bumps metrics-server to v0.3.6


solsson Oct 27, 2019
749310b

Commenting out the more frequent metric updates now


solsson Oct 27, 2019
6e5ea61

Merge branch 'registry-performance' into kubernetesone16


solsson Oct 27, 2019
250801a

Automatic volume provisioning on k3s 0.10+


solsson Oct 27, 2019
f567870

Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294


solsson Oct 27, 2019
2b83dc5

k3s 0.10.2


solsson Nov 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 16 additions & 39 deletions
bin/y-cluster-provision-k3s-multipass

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,57 +31,34 @@ 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
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 <<EOF >> $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"]
mkdir -p /etc/rancher/k3s
cat <<EOF >> /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=8833bfd961ff31b7b6de4300b201d01d3fb2bac8
export INSTALL_K3S_VERSION=v0.10.2
curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh -

service k3s start
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
Expand Down

4 changes: 2 additions & 2 deletions
kafka/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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=2927b49281a748894368ef0e9f5c83df8259ca40
- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40

4 changes: 2 additions & 2 deletions
metrics-server/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
#- metric-resolution.yaml

2 changes: 2 additions & 0 deletions
registry/generic,minio/deployment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

1 change: 0 additions & 1 deletion
registry/generic,minio/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,3 @@ bases:
- ../node-update-hosts
patchesStrategicMerge:
- deployment.yaml
- minio-host-from-nodes.yaml

15 changes: 0 additions & 15 deletions
registry/generic,minio/minio-host-from-nodes.yaml

View file


Open in desktop


This file was deleted.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

solsson
merged 9 commits into

from

Nov 12, 2019
 Merged


Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f14f21e

Simplify registry access by not requiring direct access to minio


solsson Oct 27, 2019
2e9731f

Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of b…


solsson Oct 27, 2019
010f778

Configures local registry through rancher/k3s#867


solsson Oct 27, 2019
ca0c64e

Bumps metrics-server to v0.3.6


solsson Oct 27, 2019
749310b

Commenting out the more frequent metric updates now


solsson Oct 27, 2019
6e5ea61

Merge branch 'registry-performance' into kubernetesone16


solsson Oct 27, 2019
250801a

Automatic volume provisioning on k3s 0.10+


solsson Oct 27, 2019
f567870

Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294


solsson Oct 27, 2019
2b83dc5

k3s 0.10.2


solsson Nov 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 16 additions & 39 deletions
bin/y-cluster-provision-k3s-multipass

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,57 +31,34 @@ 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
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 <<EOF >> $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"]
mkdir -p /etc/rancher/k3s
cat <<EOF >> /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=8833bfd961ff31b7b6de4300b201d01d3fb2bac8
export INSTALL_K3S_VERSION=v0.10.2
curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh -

service k3s start
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
Expand Down

4 changes: 2 additions & 2 deletions
kafka/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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=2927b49281a748894368ef0e9f5c83df8259ca40
- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40

4 changes: 2 additions & 2 deletions
metrics-server/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
#- metric-resolution.yaml

2 changes: 2 additions & 0 deletions
registry/generic,minio/deployment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

1 change: 0 additions & 1 deletion
registry/generic,minio/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,3 @@ bases:
- ../node-update-hosts
patchesStrategicMerge:
- deployment.yaml
- minio-host-from-nodes.yaml

15 changes: 0 additions & 15 deletions
registry/generic,minio/minio-host-from-nodes.yaml

View file


Open in desktop


This file was deleted.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

solsson
merged 9 commits into

from

Nov 12, 2019
 Merged


Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f14f21e

Simplify registry access by not requiring direct access to minio


solsson Oct 27, 2019
2e9731f

Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of b…


solsson Oct 27, 2019
010f778

Configures local registry through rancher/k3s#867


solsson Oct 27, 2019
ca0c64e

Bumps metrics-server to v0.3.6


solsson Oct 27, 2019
749310b

Commenting out the more frequent metric updates now


solsson Oct 27, 2019
6e5ea61

Merge branch 'registry-performance' into kubernetesone16


solsson Oct 27, 2019
250801a

Automatic volume provisioning on k3s 0.10+


solsson Oct 27, 2019
f567870

Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294


solsson Oct 27, 2019
2b83dc5

k3s 0.10.2


solsson Nov 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 16 additions & 39 deletions
bin/y-cluster-provision-k3s-multipass

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,57 +31,34 @@ 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
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 <<EOF >> $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"]
mkdir -p /etc/rancher/k3s
cat <<EOF >> /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=8833bfd961ff31b7b6de4300b201d01d3fb2bac8
export INSTALL_K3S_VERSION=v0.10.2
curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh -

service k3s start
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
Expand Down

4 changes: 2 additions & 2 deletions
kafka/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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=2927b49281a748894368ef0e9f5c83df8259ca40
- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40

4 changes: 2 additions & 2 deletions
metrics-server/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
#- metric-resolution.yaml

2 changes: 2 additions & 0 deletions
registry/generic,minio/deployment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

1 change: 0 additions & 1 deletion
registry/generic,minio/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,3 @@ bases:
- ../node-update-hosts
patchesStrategicMerge:
- deployment.yaml
- minio-host-from-nodes.yaml

15 changes: 0 additions & 15 deletions
registry/generic,minio/minio-host-from-nodes.yaml

View file


Open in desktop


This file was deleted.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

solsson
merged 9 commits into

from

Nov 12, 2019
 Merged


Kubernetes 1.16, k3s volume provisioning by default and disable registry redirects
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f14f21e

Simplify registry access by not requiring direct access to minio


solsson Oct 27, 2019
2e9731f

Upgrade to get Kubernetes 1.16, enforcing use of apps/v1 instead of b…


solsson Oct 27, 2019
010f778

Configures local registry through rancher/k3s#867


solsson Oct 27, 2019
ca0c64e

Bumps metrics-server to v0.3.6


solsson Oct 27, 2019
749310b

Commenting out the more frequent metric updates now


solsson Oct 27, 2019
6e5ea61

Merge branch 'registry-performance' into kubernetesone16


solsson Oct 27, 2019
250801a

Automatic volume provisioning on k3s 0.10+


solsson Oct 27, 2019
f567870

Fixes automatic volume provisioning, Yolean/kubernetes-kafka#294


solsson Oct 27, 2019
2b83dc5

k3s 0.10.2


solsson Nov 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 16 additions & 39 deletions
bin/y-cluster-provision-k3s-multipass

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,57 +31,34 @@ 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
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 <<EOF >> $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"]
mkdir -p /etc/rancher/k3s
cat <<EOF >> /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=8833bfd961ff31b7b6de4300b201d01d3fb2bac8
export INSTALL_K3S_VERSION=v0.10.2
curl -sfL https://github.com/rancher/k3s/raw/$INSTALLER_REVISION/install.sh | sh -

service k3s start
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
Expand Down

4 changes: 2 additions & 2 deletions
kafka/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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=2927b49281a748894368ef0e9f5c83df8259ca40
- github.com/Yolean/kubernetes-kafka/pixy?ref=2927b49281a748894368ef0e9f5c83df8259ca40

4 changes: 2 additions & 2 deletions
metrics-server/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
#- metric-resolution.yaml

2 changes: 2 additions & 0 deletions
registry/generic,minio/deployment.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

1 change: 0 additions & 1 deletion
registry/generic,minio/kustomization.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,3 @@ bases:
- ../node-update-hosts
patchesStrategicMerge:
- deployment.yaml
- minio-host-from-nodes.yaml

15 changes: 0 additions & 15 deletions
registry/generic,minio/minio-host-from-nodes.yaml

View file


Open in desktop


This file was deleted.