Merge pull request #554 from citrix/docUpdate

Operator and Dual tier topology Doc update

Author: priyankash-citrix

deployment/dual-tier/README.md

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: apache

deployment/dual-tier/manifest/all-in-one-dual-tier-demo.yaml

@@ -2,7 +2,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    ingress.citrix.com/insecure-termination: allow
     kubernetes.io/ingress.class: tier-1-vpx
   name: vpx-ingress
 spec:
@@ -12,10 +11,8 @@ spec:
       paths:
       - backend:
           service:
-            name: cpx-ingress
+            name: cpx-service
             port:
               number: 80
         path: /
         pathType: Prefix
-  tls:
-  - secretName: cert2k

deployment/dual-tier/manifest/apache.yaml

@@ -2,7 +2,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    ingress.citrix.com/insecure-termination: allow
     kubernetes.io/ingress.class: tier-2-cpx
   name: citrix-ingress
 spec:
@@ -17,5 +16,3 @@ spec:
               number: 80
         path: /
         pathType: Prefix
-  tls:
-  - secretName: cert-key

deployment/dual-tier/manifest/ingress-tier-1-vpx.yaml

@@ -8,42 +8,38 @@
 # value: "<NSIP of the Tier-1 VPX>"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
-
----
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cic-k8s-role
 rules:
   - apiGroups: [""]
-    resources: ["endpoints", "ingresses", "pods", "secrets", "nodes", "routes", "namespaces"]
+    resources: ["endpoints", "pods", "secrets", "nodes", "routes", "namespaces", "configmaps", "services"]
     verbs: ["get", "list", "watch"]
-  # services/status is needed to update the loadbalancer IP in service status for integrating
-  # service of type LoadBalancer with external-dns
   - apiGroups: [""]
     resources: ["services/status"]
     verbs: ["patch"]
-  - apiGroups: [""]
-    resources: ["services"]
-    verbs: ["get", "list", "watch", "patch"]
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["create"]
   - apiGroups: ["extensions"]
     resources: ["ingresses", "ingresses/status"]
-    verbs: ["get", "list", "watch"]
+    verbs: ["get", "list", "watch", "patch"]
+  - apiGroups: ["networking.k8s.io"]
+    resources: ["ingresses", "ingresses/status", "ingressclasses"]
+    verbs: ["get", "list", "watch", "patch"]
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]
     verbs: ["get", "list", "watch"]
   - apiGroups: ["apps"]
     resources: ["deployments"]
     verbs: ["get", "list", "watch"]
   - apiGroups: ["citrix.com"]
-    resources: ["rewritepolicies", "canarycrds", "authpolicies", "ratelimits"]
-    verbs: ["get", "list", "watch"]
+    resources: ["rewritepolicies", "authpolicies", "ratelimits", "listeners", "httproutes", "continuousdeployments", "apigatewaypolicies", "wafs", "bots", "corspolicies", "appqoepolicies"]
+    verbs: ["get", "list", "watch", "create", "delete", "patch"]
   - apiGroups: ["citrix.com"]
-    resources: ["rewritepolicies/status", "canarycrds/status", "authpolicies/status", "ratelimits/status"]
-    verbs: ["get", "list", "patch"]
+    resources: ["rewritepolicies/status", "continuousdeployments/status", "authpolicies/status", "ratelimits/status", "listeners/status", "httproutes/status", "wafs/status", "apigatewaypolicies/status", "bots/status", "corspolicies/status",  "appqoepolicies/status"]
+    verbs: ["patch"]
   - apiGroups: ["citrix.com"]
     resources: ["vips"]
     verbs: ["get", "list", "watch", "create", "delete"]
@@ -59,7 +55,9 @@ rules:
   - apiGroups: ["crd.projectcalico.org"]
     resources: ["ipamblocks"]
     verbs: ["get", "list", "watch"]
+
 ---
+
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -72,49 +70,60 @@ subjects:
 - kind: ServiceAccount
   name: cic-k8s-role
   namespace: default
-apiVersion: rbac.authorization.k8s.io/v1
+
 ---
+
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: cic-k8s-role
   namespace: default
+
 ---
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: cic-k8s-ingress-controller
-  labels:
-    app: cic-k8s-ingress-controller
 spec:
+  selector:
+    matchLabels:
+      app: cic-k8s-ingress-controller
+  replicas: 1
+  template:
+    metadata:
+      name: cic-k8s-ingress-controller
+      labels:
+        app: cic-k8s-ingress-controller
+      annotations:
+    spec: 
       serviceAccountName: cic-k8s-role
       containers:
       - name: cic-k8s-ingress-controller
         image: "quay.io/citrix/citrix-k8s-ingress-controller:1.26.7"
         env:
-        # Set NetScaler Management IP or SNIP in case of HA
-        - name: "NS_IP"
-          value: "<Kubernetes facing SNIP of VPX where MGMT access is enabled> or <NS IP of the VPX if it is reachable from K8s cluster>"
-        # Set username for Nitro
-        - name: "NS_USER"
-          valueFrom:
+         # Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled) 
+         - name: "NS_IP"
+           value: "<Kubernetes facing SNIP of VPX where MGMT access is enabled> or <NS IP of the VPX if it is reachable from K8s cluster>"
+         - name: "NS_VIP"
+           value: "<VIP of the Tier-1 VPX>"
+         # Set username for Nitro
+         - name: "NS_USER"
+           valueFrom:
             secretKeyRef:
              name: nslogin
              key: username
-        # Set user password for Nitro
-        - name: "NS_PASSWORD"
-          valueFrom:
+         - name: "LOGLEVEL"
+           value: "INFO"
+         # Set user password for Nitro
+         - name: "NS_PASSWORD"
+           valueFrom:
             secretKeyRef:
              name: nslogin
              key: password
-        - name: "EULA"
-          value: "yes"
-        - name: "NS_VIP"
-          value: "<VIP of the Tier-1 VPX>"
+         # Set log level
+         - name: "EULA"
+           value: "yes"
         args:
-          - --ingress-classes
-            tier-1-vpx
-          - --feature-node-watch
-            true
+          - --ingress-classes tier-1-vpx
+          - --feature-node-watch true
         imagePullPolicy: Always
----