Merge pull request #13189 from rramkumar1/fix-ingress

Remove old ingress-gce jobs and add a new one for our 1.6 branch

config/jobs/kubernetes/sig-network/ingress-gce-e2e.yaml

@@ -81,66 +81,6 @@ presets:
             hostPath:
               path: /etc/srv/kubernetes/l7-lb-controller
 
-- labels:
-    preset-ingress-v1.3-and-above-yaml: "true"
-  env:
-  - name: CUSTOM_INGRESS_YAML
-    # we want to keep extra spaces for the yaml file.
-    value: |2+
-        apiVersion: v1
-        kind: Pod
-        metadata:
-          name: l7-lb-controller
-          namespace: kube-system
-          annotations:
-            scheduler.alpha.kubernetes.io/critical-pod: ""
-            seccomp.security.alpha.kubernetes.io/pod: "docker/default"
-          labels:
-            k8s-app: gcp-lb-controller
-            kubernetes.io/name: "GLBC"
-        spec:
-          terminationGracePeriodSeconds: 600
-          hostNetwork: true
-          containers:
-            # HEAD is used unless otherwised specified by each individual job.
-          - image: k8s.gcr.io/ingress-gce-glbc-amd64:master
-            livenessProbe:
-              httpGet:
-                path: /healthz
-                port: 8086
-                scheme: HTTP
-              initialDelaySeconds: 30
-              # healthz reaches out to GCE
-              periodSeconds: 30
-              timeoutSeconds: 15
-              successThreshold: 1
-              failureThreshold: 5
-            name: l7-lb-controller
-            volumeMounts:
-            - mountPath: /etc/gce.conf
-              name: cloudconfig
-              readOnly: true
-            - mountPath: /var/log/glbc.log
-              name: logfile
-              readOnly: false
-            resources:
-              requests:
-                cpu: 10m
-                memory: 50Mi
-            command:
-            - sh
-            - -c
-            - "exec /glbc --enable-backend-config --gce-ratelimit=ga.Operations.Get,qps,10,100 --gce-ratelimit=alpha.Operations.Get,qps,10,100 --gce-ratelimit=beta.Operations.Get,qps,10,100 --gce-ratelimit=ga.BackendServices.Get,qps,1.8,1 --gce-ratelimit=ga.HealthChecks.Get,qps,1.8,1 --gce-ratelimit=alpha.HealthChecks.Get,qps,1.8,1 --gce-ratelimit=beta.NetworkEndpointGroups.Get,qps,1.8,1 --gce-ratelimit=beta.NetworkEndpointGroups.AttachNetworkEndpoints,qps,1.8,1 --gce-ratelimit=beta.NetworkEndpointGroups.DetachNetworkEndpoints,qps,1.8,1 --gce-ratelimit=beta.NetworkEndpointGroups.ListNetworkEndpoints,qps,1.8,1 --verbose --apiserver-host=http://localhost:8080 --default-backend-service=kube-system/default-http-backend --sync-period=600s --running-in-cluster=false --config-file-path=/etc/gce.conf --healthz-port=8086 1>>/var/log/glbc.log 2>&1"
-          volumes:
-          - hostPath:
-              path: /etc/gce.conf
-              type: FileOrCreate
-            name: cloudconfig
-          - hostPath:
-              path: /var/log/glbc.log
-              type: FileOrCreate
-            name: logfile
-
 presubmits:
   kubernetes/ingress-gce:
   - name: pull-ingress-gce-test
@@ -244,60 +184,12 @@ periodics:
       - --test_args=--ginkgo.focus=\[Feature:Ingress\]
       - --timeout=320m
 
-- name: ci-ingress-gce-e2e-release-1-3
-  interval: 240m
-  labels:
-    preset-service-account: "true"
-    preset-k8s-ssh: "true"
-    preset-ingress-v1.3-and-above-yaml: "true"
-  spec:
-    containers:
-    - image: gcr.io/k8s-testimages/kubekins-e2e:v20190624-0fabd2e-master
-      args:
-      - --timeout=340
-      - --bare
-      - --scenario=kubernetes_e2e
-      - --
-      - --check-leaked-resources
-      - --cluster=
-      - --env=GCE_GLBC_IMAGE=gcr.io/k8s-ingress-image-push/ingress-gce-glbc-amd64:release-1.3
-      - --extract=ci/latest
-      - --gcp-project-type=ingress-project
-      - --ginkgo-parallel=1
-      - --provider=gce
-      - --test_args=--ginkgo.focus=\[Feature:Ingress\]
-      - --timeout=320m
-
-- name: ci-ingress-gce-e2e-release-1-4
-  interval: 180m
-  labels:
-    preset-service-account: "true"
-    preset-k8s-ssh: "true"
-    preset-ingress-v1.3-and-above-yaml: "true"
-  spec:
-    containers:
-    - image: gcr.io/k8s-testimages/kubekins-e2e:v20190624-0fabd2e-master
-      args:
-      - --timeout=340
-      - --bare
-      - --scenario=kubernetes_e2e
-      - --
-      - --check-leaked-resources
-      - --cluster=
-      - --env=GCE_GLBC_IMAGE=gcr.io/k8s-ingress-image-push/ingress-gce-glbc-amd64:release-1.4
-      - --extract=ci/latest
-      - --gcp-project-type=ingress-project
-      - --ginkgo-parallel=1
-      - --provider=gce
-      - --test_args=--ginkgo.focus=\[Feature:Ingress\]
-      - --timeout=320m
-
-- name: ci-ingress-gce-e2e-release-1-5
+- name: ci-ingress-gce-e2e-release-1-6
   interval: 90m
   labels:
     preset-service-account: "true"
     preset-k8s-ssh: "true"
-    preset-ingress-v1.3-and-above-yaml: "true"
+    preset-ingress-master-yaml: "true"
   spec:
     containers:
     - image: gcr.io/k8s-testimages/kubekins-e2e:v20190624-0fabd2e-master
@@ -308,7 +200,7 @@ periodics:
       - --
       - --check-leaked-resources
       - --cluster=
-      - --env=GCE_GLBC_IMAGE=gcr.io/k8s-ingress-image-push/ingress-gce-glbc-amd64:release-1.4
+      - --env=GCE_GLBC_IMAGE=gcr.io/k8s-ingress-image-push/ingress-gce-glbc-amd64:release-1.6
       - --extract=ci/latest
       - --gcp-project-type=ingress-project
       - --ginkgo-parallel=1

testgrid/config.yaml

@@ -4422,16 +4422,8 @@ dashboards:
     test_group_name: ci-ingress-gce-e2e-multi-zone
     alert_options:
       alert_mail_to_addresses: [email protected]
-  - name: ingress-gce-e2e-release-1.3
-    test_group_name: ci-ingress-gce-e2e-release-1-3
-    alert_options:
-      alert_mail_to_addresses: [email protected]
-  - name: ingress-gce-e2e-release-1.4
-    test_group_name: ci-ingress-gce-e2e-release-1-4
-    alert_options:
-      alert_mail_to_addresses: [email protected]
-  - name: ingress-gce-e2e-release-1.5
-    test_group_name: ci-ingress-gce-e2e-release-1-5
+  - name: ingress-gce-e2e-release-1.6
+    test_group_name: ci-ingress-gce-e2e-release-1-6
     alert_options:
       alert_mail_to_addresses: [email protected]
   - name: ingress-gce-e2e-scale