Merge pull request #473 from raviganapatp/examples

Examples update

Author: kumar-swamy

canary/README.md

@@ -802,22 +802,25 @@ Perform the following steps to deploy a sample application as a canary release.
             
 
               ```yml
-              apiVersion: extensions/v1beta1
+              apiVersion: networking.k8s.io/v1
               kind: Ingress
               metadata:
-                name: canary-by-weight
                 annotations:
-                  kubernetes.io/ingress.class: "citrix"
                   ingress.citrix.com/canary-weight: "10"
+                  kubernetes.io/ingress.class: citrix
+                name: canary-by-weight
               spec:
                 rules:
-                - host:  webapp.com
+                - host: webapp.com
                   http:
                     paths:
-                    - path: /
-                      backend:
-                        serviceName: guestbook-canary
-                        servicePort: 80
+                    - backend:
+                        service:
+                          name: guestbook-canary
+                          port:
+                            number: 80
+                      path: /
+                      pathType: Prefix
               ```
 
     Here, the annotation `ingress.citrix.com/canary-weight: “10”` is the annotation for the weight based canary. This annotation specifies the Citrix ingress controller to configure the Citrix ADC in such a way that 10 percent of the total requests destined to  `webapp.com` is sent to the `guestbook-canary` service. This is the service for the canary version of the `Guestbook` application.

canary/manifest/baseline.yaml

@@ -1,28 +1,34 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: fronthotdrinksapp-baseline-deployment
   labels:
-      name: fronthotdrinksapp
+    name: fronthotdrinksapp
+  name: fronthotdrinksapp-baseline-deployment
   namespace: default
 spec:
   replicas: 4
+  selector:
+    matchLabels:
+      dep: cddep
+      name: fronthotdrinksapp
+      version: prod_version
   strategy:
-    type: RollingUpdate
     rollingUpdate:
       maxSurge: 10
       maxUnavailable: 10
+    type: RollingUpdate
   template:
     metadata:
       labels:
-        name: fronthotdrinksapp
         dep: cddep
-        version: "prod_version"
+        name: fronthotdrinksapp
+        version: prod_version
     spec:
       containers:
-      - name: fronthotdrinksapp
-        image: "quay.io/sample-apps/fronthotdrinksapp:v1"
+      - image: quay.io/sample-apps/fronthotdrinksapp:v1
         imagePullPolicy: Always
+        name: fronthotdrinksapp
         ports:
-        - name: port-8080
-          containerPort: 8080
+        - containerPort: 8080
+          name: port-8080
+          protocol: TCP

canary/manifest/canary-crd-class.yaml

@@ -1,36 +1,26 @@
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition 
 metadata:
   # name must match the spec fields below, and be in the form: <plural>.<group>
   name: continuousdeployments.citrix.com
 spec:
-  # group name to use for REST API: /apis/<group>/<version>
   group: citrix.com
-  # list of versions supported by this CustomResourceDefinition
-  version: v1
-  #    - name: v1
-      # Each version can be enabled/disabled by Served flag.
-      #      served: true
-      # One and only one version must be marked as the storage version.
-      #storage: true
-  # either Namespaced or Cluster
-  scope: Namespaced
   names:
-    # plural name to be used in the URL: /apis/<group>/<version>/<plural>
+    kind: continuousdeployment
     plural: continuousdeployments
-    # singular name to be used as an alias on the CLI and for display
     singular: continuousdeployment
-    # kind is normally the CamelCased singular type. Your resource manifests use this.
-    kind: continuousdeployment
-    # shortNames allow shorter string to match your resource on the CLI
-    shortNames:
-    - crd
-
-  validation:
-   # openAPIV3Schema is the schema for validating custom objects.
-    openAPIV3Schema:
-      properties:
-        spec:
-          properties:
-            cronSpec:
-              type: integer
+  scope: Namespaced
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+            properties:
+              cronSpec:
+                type: integer

canary/manifest/canary.yaml

@@ -1,28 +1,33 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: fronthotdrinksapp-canary-deployment
   labels:
-      name: fronthotdrinksapp
+    name: fronthotdrinksapp
+  name: fronthotdrinksapp-canary-deployment
   namespace: default
 spec:
   replicas: 4
+  selector:
+    matchLabels:
+      dep: cddep
+      name: fronthotdrinksapp
+      version: canary_version
   strategy:
-    type: RollingUpdate
     rollingUpdate:
       maxSurge: 10
       maxUnavailable: 10
+    type: RollingUpdate
   template:
     metadata:
       labels:
-        name: fronthotdrinksapp
         dep: cddep
-        version: "canary_version"
+        name: fronthotdrinksapp
+        version: canary_version
     spec:
       containers:
-      - name: fronthotdrinksapp
-        image: "quay.io/sample-apps/fronthotdrinksapp:v2"
+      - image: quay.io/sample-apps/fronthotdrinksapp:v2
         imagePullPolicy: Always
+        name: fronthotdrinksapp
         ports:
-        - name: port-8080
-          containerPort: 8080
+        - containerPort: 8080
+          name: port-8080

canary/manifest/cpx-exporter.yaml

@@ -1,68 +1,66 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: cpx-ingress
   labels:
     name: cpx-ingress
+  name: cpx-ingress
 spec:
   replicas: 1
   selector:
     matchLabels:
       name: cpx-ingress
   template:
     metadata:
-      labels:
-        name: cpx-ingress
       annotations:
         NETSCALER_AS_APP: "True"
+      labels:
+        name: cpx-ingress
     spec:
-      serviceAccountName: cpx 
+      serviceAccountName: cpx
       containers:
-        - name: exporter
-          image: "quay.io/citrix/citrix-adc-metrics-exporter:1.4.8"
-          args:
-            - "--target-nsip=127.0.0.1"
-            - "--port=8888"
-            - "--secure=no"
-          env:
-          - name: "NS_USER"
-            value: "nsroot"
-          - name: "NS_PASSWORD"
-            value: "nsroot"
-          securityContext:
-            readOnlyRootFilesystem: true
-          imagePullPolicy: Always
-        - name: cpx-ingress
-          image: "quay.io/citrix/citrix-k8s-cpx-ingress:13.0-47.103"
-          securityContext:
-            privileged: true
-          env:
-            - name: "EULA"
-              value: "YES"
-            - name: "KUBERNETES_TASK_ID"
-              value: ""
-          ports:
-            - name: http
-              containerPort: 80
-            - name: https
-              containerPort: 443
-            - name: nitro-http
-              containerPort: 9080
-            - name: nitro-https
-              containerPort: 9443
-
-          #This is required for Health check to succeed
-          readinessProbe:
-            failureThreshold: 3
-            httpGet:
-              path: /
-              port: 9080
-              scheme: HTTP
-            initialDelaySeconds: 60
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 1
-          imagePullPolicy: Always
+      - args:
+        - --target-nsip=127.0.0.1
+        - --port=8888
+        - --secure=no
+        env:
+        - name: NS_USER
+          value: nsroot
+        - name: NS_PASSWORD
+          value: nsroot
+        image: quay.io/citrix/citrix-adc-metrics-exporter:1.4.8
+        imagePullPolicy: Always
+        name: exporter
+        securityContext:
+          readOnlyRootFilesystem: true
+      - env:
+        - name: EULA
+          value: "YES"
+        - name: KUBERNETES_TASK_ID
+        image: quay.io/citrix/citrix-k8s-cpx-ingress:13.0-47.103
+        imagePullPolicy: Always
+        name: cpx-ingress
+        ports:
+        - containerPort: 80
+          name: http
+          protocol: TCP
+        - containerPort: 443
+          name: https
+          protocol: TCP
+        - containerPort: 9080
+          name: nitro-http
+          protocol: TCP
+        - containerPort: 9443
+          name: nitro-https
+          protocol: TCP
+        #This is required for Health check to succeed
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /
+            port: 9080
+            scheme: HTTP
+        securityContext:
+          privileged: true
 ---
 kind: Service
 apiVersion: v1