Update Aether config for Azure Central and MWC Edge
Change-Id: Id7865a62475b834fbe28997d414260eac88b9e5f
diff --git a/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml b/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
new file mode 100644
index 0000000..5551520
--- /dev/null
+++ b/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
@@ -0,0 +1,230 @@
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: network-attachment-definitions.k8s.cni.cncf.io
+spec:
+ group: k8s.cni.cncf.io
+ version: v1
+ scope: Namespaced
+ names:
+ plural: network-attachment-definitions
+ singular: network-attachment-definition
+ kind: NetworkAttachmentDefinition
+ shortNames:
+ - net-attach-def
+ validation:
+ openAPIV3Schema:
+ properties:
+ spec:
+ properties:
+ config:
+ type: string
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+ name: multus
+rules:
+ - apiGroups: ["k8s.cni.cncf.io"]
+ resources:
+ - '*'
+ verbs:
+ - '*'
+ - apiGroups:
+ - ""
+ resources:
+ - pods
+ - pods/status
+ verbs:
+ - get
+ - update
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+ name: multus
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: multus
+subjects:
+- kind: ServiceAccount
+ name: multus
+ namespace: kube-system
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: multus
+ namespace: kube-system
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+ name: multus-cni-config
+ namespace: kube-system
+ labels:
+ tier: node
+ app: multus
+data:
+ # NOTE: If you'd prefer to manually apply a configuration file, you may create one here.
+ # In the case you'd like to customize the Multus installation, you should change the arguments to the Multus pod
+ # change the "args" line below from
+ # - "--multus-conf-file=auto"
+ # to:
+ # "--multus-conf-file=/tmp/multus-conf/70-multus.conf"
+ # Additionally -- you should ensure that the name "70-multus.conf" is the alphabetically first name in the
+ # /etc/cni/net.d/ directory on each node, otherwise, it will not be used by the Kubelet.
+ cni-conf.json: |
+ {
+ "name": "multus-cni-network",
+ "type": "multus",
+ "capabilities": {
+ "portMappings": true
+ },
+ "delegates": [
+ {
+ "cniVersion": "0.3.1",
+ "name": "default-cni-network",
+ "plugins": [
+ {
+ "type": "flannel",
+ "name": "flannel.1",
+ "delegate": {
+ "isDefaultGateway": true,
+ "hairpinMode": true
+ }
+ },
+ {
+ "type": "portmap",
+ "capabilities": {
+ "portMappings": true
+ }
+ }
+ ]
+ }
+ ],
+ "kubeconfig": "/etc/cni/net.d/multus.d/multus.kubeconfig"
+ }
+---
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+ name: kube-multus-ds-amd64
+ namespace: kube-system
+ labels:
+ tier: node
+ app: multus
+spec:
+ updateStrategy:
+ type: RollingUpdate
+ template:
+ metadata:
+ labels:
+ tier: node
+ app: multus
+ spec:
+ hostNetwork: true
+ nodeSelector:
+ beta.kubernetes.io/arch: amd64
+ tolerations:
+ - operator: Exists
+ effect: NoSchedule
+ serviceAccountName: multus
+ containers:
+ - name: kube-multus
+ image: nfvpe/multus:v3.2
+ command: ["/entrypoint.sh"]
+ args:
+ - "--multus-conf-file=auto"
+ resources:
+ requests:
+ cpu: "100m"
+ memory: "50Mi"
+ limits:
+ cpu: "100m"
+ memory: "50Mi"
+ securityContext:
+ privileged: true
+ volumeMounts:
+ - name: cni
+ mountPath: /host/etc/cni/net.d
+ - name: cnibin
+ mountPath: /host/opt/cni/bin
+ - name: multus-cfg
+ mountPath: /tmp/multus-conf
+ volumes:
+ - name: cni
+ hostPath:
+ path: /etc/cni/net.d
+ - name: cnibin
+ hostPath:
+ path: /opt/cni/bin
+ - name: multus-cfg
+ configMap:
+ name: multus-cni-config
+ items:
+ - key: cni-conf.json
+ path: 70-multus.conf
+---
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+ name: kube-multus-ds-ppc64le
+ namespace: kube-system
+ labels:
+ tier: node
+ app: multus
+spec:
+ updateStrategy:
+ type: RollingUpdate
+ template:
+ metadata:
+ labels:
+ tier: node
+ app: multus
+ spec:
+ hostNetwork: true
+ nodeSelector:
+ beta.kubernetes.io/arch: ppc64le
+ tolerations:
+ - operator: Exists
+ effect: NoSchedule
+ serviceAccountName: multus
+ containers:
+ - name: kube-multus
+ # ppc64le support requires multus:latest for now. support 3.3 or later.
+ image: nfvpe/multus:latest-ppc64le
+ command: ["/entrypoint.sh"]
+ args:
+ - "--multus-conf-file=auto"
+ resources:
+ requests:
+ cpu: "100m"
+ memory: "90Mi"
+ limits:
+ cpu: "100m"
+ memory: "90Mi"
+ securityContext:
+ privileged: true
+ volumeMounts:
+ - name: cni
+ mountPath: /host/etc/cni/net.d
+ - name: cnibin
+ mountPath: /host/opt/cni/bin
+ - name: multus-cfg
+ mountPath: /tmp/multus-conf
+ volumes:
+ - name: cni
+ hostPath:
+ path: /etc/cni/net.d
+ - name: cnibin
+ hostPath:
+ path: /opt/cni/bin
+ - name: multus-cfg
+ configMap:
+ name: multus-cni-config
+ items:
+ - key: cni-conf.json
+ path: 70-multus.conf
diff --git a/deployment-configs/aether/clusters/production-central.yml b/deployment-configs/aether/clusters/production-azure-central.yml
similarity index 69%
copy from deployment-configs/aether/clusters/production-central.yml
copy to deployment-configs/aether/clusters/production-azure-central.yml
index 243dee1..2f1e45f 100644
--- a/deployment-configs/aether/clusters/production-central.yml
+++ b/deployment-configs/aether/clusters/production-azure-central.yml
@@ -1,17 +1,7 @@
-name: production-central
+name: production-azure-central
rancher_kubernetes_engine_config:
authentication:
strategy: x509
- cloud_provider:
- name: gce
- customCloudProvider: |-
- [global]
- project-id = m-cord
- network-project-id = onf-vpn
- network-name = default
- subnetwork-name = default
- regional = true
- multizone = true
ignore_docker_version: true
ingress:
provider: nginx
@@ -19,8 +9,6 @@
monitoring:
provider: none
network:
- options:
- calico_cloud_provider: gce
plugin: calico
services:
etcd:
@@ -41,18 +29,18 @@
always_pull_images: false
pod_security_policy: false
service_node_port_range: 2000-36767
- service_cluster_ip_range: 10.52.128.0/17
+ service_cluster_ip_range: 10.55.128.0/17
extra_args:
feature-gates: "SCTPSupport=True"
kubelet:
- cluster_domain: product.central
- cluster_dns_server: 10.52.128.10
+ cluster_domain: azure.central
+ cluster_dns_server: 10.55.128.10
fail_swap_on: false
extra_args:
feature-gates: "SCTPSupport=True"
kube-controller:
- cluster_cidr: 10.52.0.0/17
- service_cluster_ip_range: 10.52.128.0/17
+ cluster_cidr: 10.55.0.0/17
+ service_cluster_ip_range: 10.55.128.0/17
extra_args:
feature-gates: "SCTPSupport=True"
scheduler:
@@ -65,14 +53,6 @@
addon_job_timeout: 30
addons: |-
---
- apiVersion: storage.k8s.io/v1
- kind: StorageClass
- metadata:
- name: zonal-ssd
- provisioner: kubernetes.io/gce-pd
- parameters:
- type: pd-ssd
- ---
apiVersion: v1
kind: ConfigMap
metadata:
@@ -83,7 +63,7 @@
.:53 {
errors
health
- kubernetes product.central in-addr.arpa ip6.arpa {
+ kubernetes azure.central in-addr.arpa ip6.arpa {
pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa
@@ -96,10 +76,10 @@
reload
loadbalance
}
- menlo.edge:53 {
+ mwc.edge:53 {
errors
cache 30
- forward . 10.53.128.10
+ forward . 10.54.128.10
}
windows_prefered_cluster: false
diff --git a/deployment-configs/aether/clusters/production-edge-mwc.yaml b/deployment-configs/aether/clusters/production-edge-mwc.yaml
index 5d5f017..040d4ae 100644
--- a/deployment-configs/aether/clusters/production-edge-mwc.yaml
+++ b/deployment-configs/aether/clusters/production-edge-mwc.yaml
@@ -81,8 +81,13 @@
cache 30
forward . 10.52.128.10
}
+ azure.central:53 {
+ errors
+ cache 30
+ forward . 10.55.128.10
+ }
addons_include:
- - https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset-pre-1.16.yml
+ - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
windows_prefered_cluster: false
docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/production-edge-onf-menlo.yml b/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
index 3a7bed9..9121b7f 100644
--- a/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
+++ b/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
@@ -82,7 +82,7 @@
forward . 10.52.128.10
}
addons_include:
- - https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset-pre-1.16.yml
+ - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
windows_prefered_cluster: false
docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/production-central.yml b/deployment-configs/aether/clusters/production-gcp-central.yml
similarity index 95%
rename from deployment-configs/aether/clusters/production-central.yml
rename to deployment-configs/aether/clusters/production-gcp-central.yml
index 243dee1..5360c1c 100644
--- a/deployment-configs/aether/clusters/production-central.yml
+++ b/deployment-configs/aether/clusters/production-gcp-central.yml
@@ -101,6 +101,11 @@
cache 30
forward . 10.53.128.10
}
+ mwc.edge:53 {
+ errors
+ cache 30
+ forward . 10.54.128.10
+ }
windows_prefered_cluster: false
docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/staging-edge-nokia.yml b/deployment-configs/aether/clusters/staging-edge-nokia.yml
index b750647..ba9ffdd 100644
--- a/deployment-configs/aether/clusters/staging-edge-nokia.yml
+++ b/deployment-configs/aether/clusters/staging-edge-nokia.yml
@@ -82,7 +82,7 @@
forward . 10.47.128.10
}
addons_include:
- - https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset-pre-1.16.yml
+ - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
windows_prefered_cluster: false
docker_root_dir: /var/lib/docker