Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 50ea9376f1 | |||
| 4b8f9313c8 | |||
| bb330a0365 |
@@ -35,7 +35,7 @@ spec:
|
|||||||
mountPath: /combined-certs
|
mountPath: /combined-certs
|
||||||
containers:
|
containers:
|
||||||
- name: api
|
- name: api
|
||||||
image: git.unkin.net/unkin/artifactapi:v3.7.3
|
image: git.unkin.net/unkin/artifactapi:v3.7.4
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8000
|
- containerPort: 8000
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ spec:
|
|||||||
automountServiceAccountToken: true
|
automountServiceAccountToken: true
|
||||||
containers:
|
containers:
|
||||||
- name: ui
|
- name: ui
|
||||||
image: git.unkin.net/unkin/artifactapi-ui:v3.7.3
|
image: git.unkin.net/unkin/artifactapi-ui:v3.7.4
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
---
|
|
||||||
# Authoritative masters (replaces the 3x Puppet authoritative servers).
|
|
||||||
# pod-0 is the primary; pods 1-2 replicate via the catalog zone + AXFR/IXFR.
|
|
||||||
apiVersion: bind.unkin.net/v1alpha1
|
|
||||||
kind: BindCluster
|
|
||||||
metadata:
|
|
||||||
name: auth
|
|
||||||
namespace: binddns-auth
|
|
||||||
spec:
|
|
||||||
mode: authoritative
|
|
||||||
replicas: 3
|
|
||||||
storageClassName: cephrbd-fast-delete
|
|
||||||
storageSize: 2Gi
|
|
||||||
service:
|
|
||||||
type: LoadBalancer
|
|
||||||
annotations:
|
|
||||||
purelb.io/service-group: common
|
|
||||||
external-dns.alpha.kubernetes.io/hostname: ns-auth.k8s.syd1.au.unkin.net
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 128Mi
|
|
||||||
limits:
|
|
||||||
cpu: "1"
|
|
||||||
memory: 512Mi
|
|
||||||
---
|
|
||||||
# Catalog zone so new BindZones auto-provision onto the secondaries.
|
|
||||||
apiVersion: bind.unkin.net/v1alpha1
|
|
||||||
kind: BindCatalogZone
|
|
||||||
metadata:
|
|
||||||
name: auth-catalog
|
|
||||||
namespace: binddns-auth
|
|
||||||
spec:
|
|
||||||
clusterRef: auth
|
|
||||||
zoneName: catalog.internal
|
|
||||||
transferKeyRef: transfer-key
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
---
|
|
||||||
# Zone-transfer / catalog key. The operator generates the material into a
|
|
||||||
# Secret (transfer-key-tsig); nothing sensitive is committed to git.
|
|
||||||
apiVersion: bind.unkin.net/v1alpha1
|
|
||||||
kind: BindTSIGKey
|
|
||||||
metadata:
|
|
||||||
name: transfer-key
|
|
||||||
namespace: binddns-auth
|
|
||||||
spec:
|
|
||||||
algorithm: hmac-sha256
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- namespace.yaml
|
|
||||||
- tsigkey.yaml
|
|
||||||
- cluster.yaml
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: binddns-externaldns
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
---
|
|
||||||
# Recursive resolvers (replaces the 3x Puppet only-resolver servers).
|
|
||||||
# Three identical recursive servers; no zone replication.
|
|
||||||
apiVersion: bind.unkin.net/v1alpha1
|
|
||||||
kind: BindCluster
|
|
||||||
metadata:
|
|
||||||
name: resolver
|
|
||||||
namespace: binddns-resolver
|
|
||||||
spec:
|
|
||||||
mode: resolver
|
|
||||||
replicas: 3
|
|
||||||
storageClassName: cephrbd-fast-delete
|
|
||||||
storageSize: 1Gi
|
|
||||||
service:
|
|
||||||
type: LoadBalancer
|
|
||||||
annotations:
|
|
||||||
purelb.io/service-group: common
|
|
||||||
external-dns.alpha.kubernetes.io/hostname: resolver.k8s.syd1.au.unkin.net
|
|
||||||
forwarders:
|
|
||||||
- 1.1.1.1
|
|
||||||
- 9.9.9.9
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 128Mi
|
|
||||||
limits:
|
|
||||||
cpu: "1"
|
|
||||||
memory: 512Mi
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- namespace.yaml
|
|
||||||
- cluster.yaml
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: binddns-resolver
|
|
||||||
@@ -6,7 +6,7 @@ apiVersion: bind.unkin.net/v1alpha1
|
|||||||
kind: BindCluster
|
kind: BindCluster
|
||||||
metadata:
|
metadata:
|
||||||
name: externaldns
|
name: externaldns
|
||||||
namespace: binddns-externaldns
|
namespace: ns-externaldns
|
||||||
spec:
|
spec:
|
||||||
mode: authoritative
|
mode: authoritative
|
||||||
replicas: 3
|
replicas: 3
|
||||||
@@ -15,8 +15,9 @@ spec:
|
|||||||
service:
|
service:
|
||||||
type: LoadBalancer
|
type: LoadBalancer
|
||||||
annotations:
|
annotations:
|
||||||
purelb.io/service-group: dmz
|
purelb.io/service-group: common
|
||||||
external-dns.alpha.kubernetes.io/hostname: ns-ext.k8s.syd1.au.unkin.net
|
purelb.io/addresses: 198.18.200.8
|
||||||
|
external-dns.alpha.kubernetes.io/hostname: ns-externaldns.k8s.syd1.au.unkin.net
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
@@ -2,4 +2,4 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Namespace
|
kind: Namespace
|
||||||
metadata:
|
metadata:
|
||||||
name: binddns-auth
|
name: ns-externaldns
|
||||||
@@ -5,6 +5,6 @@ apiVersion: bind.unkin.net/v1alpha1
|
|||||||
kind: BindTSIGKey
|
kind: BindTSIGKey
|
||||||
metadata:
|
metadata:
|
||||||
name: externaldns-key
|
name: externaldns-key
|
||||||
namespace: binddns-externaldns
|
namespace: ns-externaldns
|
||||||
spec:
|
spec:
|
||||||
algorithm: hmac-sha256
|
algorithm: hmac-sha256
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- ../../../base/binddns-externaldns
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- ../../../base/binddns-resolver
|
|
||||||
+1
-1
@@ -3,4 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
|||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
- ../../../base/binddns-auth
|
- ../../../base/ns-externaldns
|
||||||
Reference in New Issue
Block a user