-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(fix) Create addon to configure registry helper
- Service Account and binding to run the job - Registry aliases ConfigMap - Registry aliases daemonset to update the node etc/hosts fixes: 4604 Signed-off-by: Kamesh Sampath <ksampath@redhat.com>
- Loading branch information
Kamesh Sampath
committed
Feb 16, 2020
1 parent
1d3cef6
commit 0042e5f
Showing
7 changed files
with
151 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
apiVersion: apps/v1 | ||
kind: DaemonSet | ||
metadata: | ||
name: registry-aliases-hosts-update | ||
namespace: kube-system | ||
labels: | ||
kubernetes.io/minikube-addons: registry-aliases | ||
addonmanager.kubernetes.io/mode: Reconcile | ||
spec: | ||
selector: | ||
matchLabels: | ||
app: registry-aliases-hosts-update | ||
template: | ||
metadata: | ||
labels: | ||
app: registry-aliases-hosts-update | ||
spec: | ||
initContainers: | ||
- name: update | ||
image: registry.fedoraproject.org/fedora | ||
volumeMounts: | ||
- name: etchosts | ||
mountPath: /host-etc/hosts | ||
readOnly: false | ||
env: | ||
- name: REGISTRY_ALIASES | ||
valueFrom: | ||
configMapKeyRef: | ||
name: registry-aliases | ||
key: registryAliases | ||
command: | ||
- bash | ||
- -ce | ||
- | | ||
NL=$'\n' | ||
TAB=$'\t' | ||
HOSTS="$(cat /host-etc/hosts)" | ||
[ -z "$REGISTRY_SERVICE_HOST" ] && echo "Failed to get hosts entry for default registry" && exit 1; | ||
for H in $REGISTRY_ALIASES; do | ||
echo "$HOSTS" | grep "$H" || HOSTS="$HOSTS$NL$REGISTRY_SERVICE_HOST$TAB$H"; | ||
done; | ||
echo "$HOSTS" | diff -u /host-etc/hosts - || echo "$HOSTS" > /host-etc/hosts | ||
echo "Done." | ||
containers: | ||
- name: pause-for-update | ||
image: gcr.io/google_containers/pause-amd64:3.1 | ||
terminationGracePeriodSeconds: 30 | ||
volumes: | ||
- name: etchosts | ||
hostPath: | ||
path: /etc/hosts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
--- | ||
apiVersion: batch/v1 | ||
kind: Job | ||
metadata: | ||
name: registry-aliases-patch-core-dns | ||
namespace: kube-system | ||
spec: | ||
ttlSecondsAfterFinished: 100 | ||
template: | ||
spec: | ||
serviceAccountName: registry-aliases-sa | ||
volumes: | ||
- name: minikube | ||
hostPath: | ||
path: /var/lib/minikube/binaries | ||
containers: | ||
- name: core-dns-patcher | ||
image: quay.io/rhdevelopers/core-dns-patcher | ||
imagePullPolicy: IfNotPresent | ||
# using the kubectl from the minikube instance | ||
volumeMounts: | ||
- mountPath: /var/lib/minikube/binaries | ||
name: minikube | ||
readOnly: true | ||
restartPolicy: Never | ||
backoffLimit: 4 |
18 changes: 18 additions & 0 deletions
18
deploy/addons/registry-aliases/registry-aliases-config.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: registry-aliases | ||
namespace: kube-system | ||
labels: | ||
kubernetes.io/minikube-addons: registry-aliases | ||
addonmanager.kubernetes.io/mode: Reconcile | ||
data: | ||
# Add additonal hosts seperated by new-line | ||
registryAliases: >- | ||
example.org | ||
example.com | ||
test.com | ||
test.org | ||
# default registry address in minikube when enabled via minikube addons enable registry | ||
registrySvc: registry.kube-system.svc.cluster.local | ||
|
12 changes: 12 additions & 0 deletions
12
deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
kind: ClusterRoleBinding | ||
metadata: | ||
name: registry-aliases-crb | ||
subjects: | ||
- kind: ServiceAccount | ||
name: registry-aliases-sa | ||
namespace: kube-system | ||
roleRef: | ||
kind: ClusterRole | ||
name: cluster-admin | ||
apiGroup: rbac.authorization.k8s.io |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: registry-aliases-sa | ||
namespace: kube-system |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters