From fc372fdc862bc55750fb9f08084ea59d3c6ec5d7 Mon Sep 17 00:00:00 2001 From: Jim Galasyn Date: Fri, 13 Apr 2018 14:47:50 -0700 Subject: [PATCH] Remove references to Beta (#608) --- ee/index.md | 4 ++-- .../kubernetes/deploy-ingress-controller.md | 24 ------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/ee/index.md b/ee/index.md index 71d81ffbdc..4965e71406 100644 --- a/ee/index.md +++ b/ee/index.md @@ -101,9 +101,9 @@ to schedule Kubernetes or Swarm workloads. ![](images/docker-ee-overview-3.svg){: .with-border} - Image signing and scanning of Kubernetes apps for validating and verifying content -- Image promotion with mirroring between registries (not in Beta1) +- Image promotion with mirroring between registries - Define policies for automating image promotions across the app development - lifecycle of Kubernetes apps (not in Beta1) + lifecycle of Kubernetes apps ## Centralized cluster management diff --git a/ee/ucp/kubernetes/deploy-ingress-controller.md b/ee/ucp/kubernetes/deploy-ingress-controller.md index 61309341fb..73af349e87 100644 --- a/ee/ucp/kubernetes/deploy-ingress-controller.md +++ b/ee/ucp/kubernetes/deploy-ingress-controller.md @@ -49,23 +49,6 @@ Learn about [ingress in Kubernetes](https://v1-8.docs.kubernetes.io/docs/concept ## Create a grant -> Docker EE 2.0 Beta2 -> -> In Beta2, default service accounts have limited or no permissions, and all -> other service accounts have full admin-scoped privileges. Instead of creating -> a grant, create a service account named `nginx-service-account` in the -> `ingress-nginx` namespace. -> -> ```yaml -> apiVersion: v1 -> kind: ServiceAccount -> metadata: -> name: nginx-service-account -> namespace: ingress-nginx -> ``` -> -> Skip to the [Install the NGINX ingress controller](#install-the-nginx-ingress-controller) procedure. - The default service account that's associated with the `ingress-nginx` namespace needs access to Kubernetes resources, so create a grant with `Restricted Control` permissions. @@ -101,11 +84,6 @@ main components: Navigate to the **Create Kubernetes Object** page, and in the **Object YAML** editor, paste the following YAML. -> Docker EE 2.0 Beta2 -> -> Uncomment `serviceAccountName: nginx-service-account` to use the -> service account that you created previously. - ```yaml apiVersion: extensions/v1beta1 kind: Deployment @@ -197,8 +175,6 @@ spec: prometheus.io/port: '10254' prometheus.io/scrape: 'true' spec: - # Beta2 only: Uncomment the following line - # serviceAccountName: nginx-service-account initContainers: - command: - sh