From 654784dccfce7cafb650a049227bc360da33dfda Mon Sep 17 00:00:00 2001 From: Subash Dangol Date: Wed, 6 Sep 2023 18:28:08 +0530 Subject: [PATCH 1/2] Releasing CNC v2.2.11 Signed-off-by: Subash Dangol --- deploy/citrix-k8s-node-controller.yaml | 84 +++++++++----------------- deploy/config_map.yaml | 4 +- deploy/configmap_tolerations.yaml | 11 ---- 3 files changed, 31 insertions(+), 68 deletions(-) delete mode 100644 deploy/configmap_tolerations.yaml diff --git a/deploy/citrix-k8s-node-controller.yaml b/deploy/citrix-k8s-node-controller.yaml index c681866..347f680 100644 --- a/deploy/citrix-k8s-node-controller.yaml +++ b/deploy/citrix-k8s-node-controller.yaml @@ -4,10 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: citrix-node-controller rules: - - apiGroups: ["*"] + - apiGroups: [""] resources: ["configmaps", "pods"] verbs: ["get", "list", "watch", "create", "patch", "delete", "update"] - - apiGroups: [""] + - apiGroups: ["*"] resources: ["configmaps", "pods"] verbs: ["get", "list", "watch", "create", "patch", "delete", "update"] - apiGroups: [""] @@ -37,90 +37,62 @@ roleRef: subjects: - kind: ServiceAccount name: citrix-node-controller - namespace: default -apiVersion: rbac.authorization.k8s.io/v1 + namespace: citrix-system --- apiVersion: v1 kind: ServiceAccount metadata: name: citrix-node-controller - namespace: default ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: kube-cnc-router -rules: - - apiGroups: ["*"] - resources: ["configmaps"] - verbs: ["get", "list", "watch", "create", "patch", "delete", "update"] - - apiGroups: [""] - resources: ["configmaps"] - verbs: ["get", "list", "watch", "create", "patch", "delete", "update"] - - apiGroups: ["crd.projectcalico.org"] - resources: ["ipamblocks"] - verbs: ["get", "list"] + namespace: citrix-system --- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: kube-cnc-router -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kube-cnc-router -subjects: -- kind: ServiceAccount - name: kube-cnc-router - namespace: default -apiVersion: rbac.authorization.k8s.io/v1 ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: kube-cnc-router - namespace: default - ---- -apiVersion: apps/v1 +apiVersion: apps/v1 # for k8s versions before 1.9.0 use apps/v1beta2 and before 1.8.0 use extensions/v1beta1 kind: Deployment metadata: - name: citrix-node-controller + name: cnc-citrix-node-controller + namespace: citrix-system spec: selector: matchLabels: - app: citrix-node-controller + app.kubernetes.io/name: citrix-node-controller + app.kubernetes.io/instance: cnc replicas: 1 template: metadata: labels: - app: citrix-node-controller + app.kubernetes.io/name: citrix-node-controller + app.kubernetes.io/instance: cnc spec: serviceAccountName: citrix-node-controller containers: - name: citrix-node-controller - image: "quay.io/citrix/citrix-k8s-node-controller:2.2.10" + image: "quay.io/citrix/citrix-k8s-node-controller:2.2.11" imagePullPolicy: Always env: + - name: EULA + value: "yes" - name: NS_IP value: "xxxxxxx" - name: NS_USER valueFrom: secretKeyRef: - name: nslogin - key: username + name: nslogin + key: username - name: NS_PASSWORD valueFrom: secretKeyRef: - name: nslogin - key: password + name: nslogin + key: password - name: NETWORK - value: "172.16.3.0/24" + value: "172.18.3.0/24" - name: REMOTE_VTEPIP - value: "xx.xx.xx.xx" - - name: VXLAN_PORT - value: "3267" + value: "xx.xx.xx.yy" - name: VNID - value: "300" + value: "175" + - name: VXLAN_PORT + value: "8472" - name: CNI_TYPE - value: "xxxx" + value: + - name: "CNC_ROUTER_NAME" + value: kube-cnc-router + - name: "CNC_CONFIGMAP" + value: citrix-node-controller \ No newline at end of file diff --git a/deploy/config_map.yaml b/deploy/config_map.yaml index beefbe7..f79d5e2 100644 --- a/deploy/config_map.yaml +++ b/deploy/config_map.yaml @@ -1,5 +1,7 @@ apiVersion: v1 kind: ConfigMap -apiVersion: v1 metadata: name: citrix-node-controller +data: + tolerations.json: | + [] \ No newline at end of file diff --git a/deploy/configmap_tolerations.yaml b/deploy/configmap_tolerations.yaml deleted file mode 100644 index ec47210..0000000 --- a/deploy/configmap_tolerations.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -apiVersion: v1 -metadata: - name: citrix-node-controller -data: - key: "xxx" - operator: "xxx" - value: "xxx" - effect: "xxx" - tolerationseconds: "xxx" From dd4d56693c4edfb48f4ecf7100d356997555ae87 Mon Sep 17 00:00:00 2001 From: Subash Dangol Date: Wed, 6 Sep 2023 19:04:28 +0530 Subject: [PATCH 2/2] Releasing CNC v2.2.11 Signed-off-by: Subash Dangol --- deploy/citrix-k8s-node-controller.yaml | 40 ++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/deploy/citrix-k8s-node-controller.yaml b/deploy/citrix-k8s-node-controller.yaml index 347f680..6be158e 100644 --- a/deploy/citrix-k8s-node-controller.yaml +++ b/deploy/citrix-k8s-node-controller.yaml @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: citrix-node-controller rules: - - apiGroups: [""] + - apiGroups: ["*"] resources: ["configmaps", "pods"] verbs: ["get", "list", "watch", "create", "patch", "delete", "update"] - apiGroups: ["*"] @@ -37,13 +37,47 @@ roleRef: subjects: - kind: ServiceAccount name: citrix-node-controller - namespace: citrix-system + namespace: default --- apiVersion: v1 kind: ServiceAccount metadata: name: citrix-node-controller - namespace: citrix-system + namespace: default +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kube-cnc-router +rules: + - apiGroups: ["*"] + resources: ["configmaps"] + verbs: ["get", "list", "watch", "create", "patch", "delete", "update"] + - apiGroups: [""] + resources: ["configmaps"] + verbs: ["get", "list", "watch", "create", "patch", "delete", "update"] + - apiGroups: ["crd.projectcalico.org"] + resources: ["ipamblocks"] + verbs: ["get", "list"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kube-cnc-router +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: kube-cnc-router +subjects: +- kind: ServiceAccount + name: kube-cnc-router + namespace: default +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: kube-cnc-router + namespace: default --- apiVersion: apps/v1 # for k8s versions before 1.9.0 use apps/v1beta2 and before 1.8.0 use extensions/v1beta1 kind: Deployment