Browse Source

Calico v3 Uplift

- Updates versions and calico files to move to Calico v3.2.
- Based on [0].

[0] https://review.openstack.org/#/c/606872

Change-Id: If0a901d2e6ef12f401651297906c9a2f126d36e5
Aaron Sheffield 6 months ago
parent
commit
44f0053dad

+ 24
- 19
deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml View File

@@ -31,7 +31,7 @@ metadata:
31 31
         name: common-addresses
32 32
         path: .kubernetes.api_service_ip
33 33
       dest:
34
-        path: .values.conf.policy_controller.K8S_API
34
+        path: .values.conf.controllers.K8S_API
35 35
         pattern: KUBERNETES_IP
36 36
     -
37 37
       src:
@@ -100,29 +100,34 @@ data:
100 100
     conf:
101 101
       cni_network_config:
102 102
         name: k8s-pod-network
103
-        cniVersion: 0.1.0
104
-        type: calico
105
-        etcd_endpoints: __ETCD_ENDPOINTS__
106
-        etcd_ca_cert_file: /etc/calico/pki/ca
107
-        etcd_cert_file: /etc/calico/pki/crt
108
-        etcd_key_file: /etc/calico/pki/key
109
-        log_level: debug
110
-        mtu: 1500
111
-        ipam:
112
-          type: calico-ipam
113
-        policy:
114
-          type: k8s
115
-          k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__
116
-          k8s_auth_token: __SERVICEACCOUNT_TOKEN__
103
+        cniVersion: 0.3.0
104
+        plugins:
105
+          - type: calico
106
+            etcd_endpoints: __ETCD_ENDPOINTS__
107
+            etcd_ca_cert_file: /etc/calico/pki/ca
108
+            etcd_cert_file: /etc/calico/pki/crt
109
+            etcd_key_file: /etc/calico/pki/key
110
+            log_level: debug
111
+            ipam:
112
+              type: calico-ipam
113
+            policy:
114
+              type: k8s
115
+            kubernetes:
116
+              kubeconfig: __KUBECONFIG_FILEPATH__
117
+          - type: portmap
118
+            snat: true
119
+            capabilities:
120
+              portMappings: true
117 121
 
118
-      policy_controller:
122
+      controllers:
119 123
         K8S_API: "https://KUBERNETES_IP:443"
120 124
 
121 125
       node:
122 126
         CALICO_STARTUP_LOGLEVEL: INFO
123
-        CLUSTER_TYPE:
124
-          - k8s
125
-          - bgp
127
+        CLUSTER_TYPE: "k8s,bgp"
128
+        ETCD_CA_CERT_FILE: /etc/calico/pki/ca
129
+        ETCD_CERT_FILE: /etc/calico/pki/crt
130
+        ETCD_KEY_FILE: /etc/calico/pki/key
126 131
         IP_AUTODETECTION_METHOD: interface=ens3
127 132
         WAIT_FOR_STORAGE: "true"
128 133
 

+ 7
- 7
deployment_files/global/v1.0demo/software/config/versions.yaml View File

@@ -27,12 +27,12 @@ data:
27 27
           type: git
28 28
           location: https://git.openstack.org/openstack/openstack-helm-infra
29 29
           subpath: calico
30
-          reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
30
+          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
31 31
         calico-htk:
32 32
           type: git
33 33
           location: https://git.openstack.org/openstack/openstack-helm-infra
34 34
           subpath: helm-toolkit
35
-          reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
35
+          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
36 36
       apiserver:
37 37
         type: git
38 38
         location: https://git.openstack.org/openstack/airship-promenade
@@ -583,11 +583,11 @@ data:
583 583
         etcd: quay.io/coreos/etcd:v3.2.14
584 584
         etcdctl: quay.io/coreos/etcd:v3.2.14
585 585
       calico:
586
-        cni: quay.io/calico/cni:v1.11.2
587
-        ctl: quay.io/calico/ctl:v1.6.2
588
-        kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0
589
-        node: quay.io/calico/node:v2.6.5
590
-        settings: quay.io/calico/ctl:v1.6.2
586
+        cni: quay.io/calico/cni:v3.2.1
587
+        ctl: quay.io/calico/ctl:release-v3.2-amd64
588
+        kube_controllers: quay.io/calico/kube-controllers:v3.2.1
589
+        node: quay.io/calico/node:v3.2.1
590
+        settings: quay.io/calico/ctl:release-v3.2-amd64
591 591
     osh:
592 592
       memcached:
593 593
         dep_check: *dep_check

+ 24
- 19
deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml View File

@@ -31,7 +31,7 @@ metadata:
31 31
         name: common-addresses
32 32
         path: .kubernetes.api_service_ip
33 33
       dest:
34
-        path: .values.conf.policy_controller.K8S_API
34
+        path: .values.conf.controllers.K8S_API
35 35
         pattern: KUBERNETES_IP
36 36
     -
37 37
       src:
@@ -100,29 +100,34 @@ data:
100 100
     conf:
101 101
       cni_network_config:
102 102
         name: k8s-pod-network
103
-        cniVersion: 0.1.0
104
-        type: calico
105
-        etcd_endpoints: __ETCD_ENDPOINTS__
106
-        etcd_ca_cert_file: /etc/calico/pki/ca
107
-        etcd_cert_file: /etc/calico/pki/crt
108
-        etcd_key_file: /etc/calico/pki/key
109
-        log_level: debug
110
-        mtu: 1500
111
-        ipam:
112
-          type: calico-ipam
113
-        policy:
114
-          type: k8s
115
-          k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__
116
-          k8s_auth_token: __SERVICEACCOUNT_TOKEN__
103
+        cniVersion: 0.3.0
104
+        plugins:
105
+          - type: calico
106
+            etcd_endpoints: __ETCD_ENDPOINTS__
107
+            etcd_ca_cert_file: /etc/calico/pki/ca
108
+            etcd_cert_file: /etc/calico/pki/crt
109
+            etcd_key_file: /etc/calico/pki/key
110
+            log_level: debug
111
+            ipam:
112
+              type: calico-ipam
113
+            policy:
114
+              type: k8s
115
+            kubernetes:
116
+              kubeconfig: __KUBECONFIG_FILEPATH__
117
+          - type: portmap
118
+            snat: true
119
+            capabilities:
120
+              portMappings: true
117 121
 
118
-      policy_controller:
122
+      controllers:
119 123
         K8S_API: "https://KUBERNETES_IP:443"
120 124
 
121 125
       node:
122 126
         CALICO_STARTUP_LOGLEVEL: INFO
123
-        CLUSTER_TYPE:
124
-          - k8s
125
-          - bgp
127
+        CLUSTER_TYPE: "k8s,bgp"
128
+        ETCD_CA_CERT_FILE: /etc/calico/pki/ca
129
+        ETCD_CERT_FILE: /etc/calico/pki/crt
130
+        ETCD_KEY_FILE: /etc/calico/pki/key
126 131
         IP_AUTODETECTION_METHOD: interface=ens3
127 132
         WAIT_FOR_STORAGE: "true"
128 133
 

+ 7
- 7
deployment_files/global/v1.0dev/software/config/versions.yaml View File

@@ -27,12 +27,12 @@ data:
27 27
           type: git
28 28
           location: https://git.openstack.org/openstack/openstack-helm-infra
29 29
           subpath: calico
30
-          reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
30
+          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
31 31
         calico-htk:
32 32
           type: git
33 33
           location: https://git.openstack.org/openstack/openstack-helm-infra
34 34
           subpath: helm-toolkit
35
-          reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
35
+          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
36 36
       apiserver:
37 37
         type: git
38 38
         location: https://git.openstack.org/openstack/airship-promenade
@@ -431,11 +431,11 @@ data:
431 431
         etcd: quay.io/coreos/etcd:v3.2.14
432 432
         etcdctl: quay.io/coreos/etcd:v3.2.14
433 433
       calico:
434
-        cni: quay.io/calico/cni:v1.11.2
435
-        ctl: quay.io/calico/ctl:v1.6.2
436
-        kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0
437
-        node: quay.io/calico/node:v2.6.5
438
-        settings: quay.io/calico/ctl:v1.6.2
434
+        cni: quay.io/calico/cni:v3.2.1
435
+        ctl: quay.io/calico/ctl:release-v3.2-amd64
436
+        kube_controllers: quay.io/calico/kube-controllers:v3.2.1
437
+        node: quay.io/calico/node:v3.2.1
438
+        settings: quay.io/calico/ctl:release-v3.2-amd64
439 439
   packages:
440 440
     named:
441 441
       docker: docker.io

Loading…
Cancel
Save