openshift · benjaminapetersen · Sep 17, 2019 · Sep 20, 2019 · Sep 26, 2019 · Sep 27, 2019
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -3,19 +3,19 @@ import:
 
 # kube
 - package: k8s.io/apimachinery
-  version: kubernetes-1.14.0
+  version: kubernetes-1.16.0
 - package: k8s.io/api
-  version: kubernetes-1.14.0
+  version: kubernetes-1.16.0
 - package: k8s.io/apiserver
-  version: kubernetes-1.14.0
+  version: kubernetes-1.16.0
 - package: k8s.io/client-go
-  version: kubernetes-1.14.0
+  version: kubernetes-1.16.0
 - package: k8s.io/kube-aggregator
-  version: kubernetes-1.14.0
+  version: kubernetes-1.16.0
 - package: k8s.io/code-generator
-  version: kubernetes-1.14.0
+  version: kubernetes-1.16.0
 - package: k8s.io/component-base
-  version: kubernetes-1.14.0
+  version: kubernetes-1.16.0
 
 # openshift
 - package: github.com/openshift/api
@@ -29,10 +29,12 @@ import:
 
 # codegen
 - package: k8s.io/gengo/args
-  version: 01a732e01d00cb9a81bb0ca050d3e6d2b947927b
+  version: 26a664648505d962332bda642b27306bc10d1082
 - package: golang.org/x/tools/imports
 
 # third party
+- package: sigs.k8s.io/structured-merge-diff
+  version: 0c1d754dd6485aa156ff3c8c599079adac6ec82f
 - package: github.com/go-test/deep
   version: master
 

diff --git a/hack/test-unit.sh b/hack/test-unit.sh
@@ -16,6 +16,7 @@ PACKAGES_TO_TEST=(
     "github.com/openshift/console-operator/pkg/console/subresource/secret"
     "github.com/openshift/console-operator/pkg/console/subresource/service"
     "github.com/openshift/console-operator/pkg/console/subresource/util"
+    "github.com/openshift/console-operator/pkg/console/controllers/clidownloads"
     "github.com/openshift/console-operator/pkg/console/version"
     "github.com/openshift/console-operator/pkg/crypto"
     # "github.com/openshift/console-operator/pkg/generated"

diff --git a/manifests/00-crd-consoleclidownloads.yaml b/manifests/00-crd-consoleclidownloads.yaml
@@ -0,0 +1,85 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: consoleclidownloads.console.openshift.io
+  annotations:
+    displayName: ConsoleCLIDownload
+    description: Extension for configuring openshift web console command line interface
+      (CLI) downloads.
+spec:
+  scope: Cluster
+  group: console.openshift.io
+  versions:
+    - name: v1
+      served: true
+      storage: true
+  names:
+    plural: consoleclidownloads
+    singular: consoleclidownload
+    kind: ConsoleCLIDownload
+    listKind: ConsoleCLIDownloadList
+  additionalPrinterColumns:
+    - name: Display name
+      type: string
+      JSONPath: .spec.displayName
+    - name: Age
+      type: string
+      JSONPath: .metadata.creationTimestamp
+    - name: Description
+      type: string
+      JSONPath: .spec.description
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: ConsoleCLIDownload is an extension for configuring openshift web
+        console command line interface (CLI) downloads.
+      type: object
+      required:
+        - spec
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          description: Standard object's metadata.
+          type: object
+        spec:
+          description: ConsoleCLIDownloadSpec is the desired cli download configuration.
+          type: object
+          required:
+            - description
+            - displayName
+            - links
+          properties:
+            description:
+              description: description is the description of the CLI download (can
+                include markdown).
+              type: string
+            displayName:
+              description: displayName is the display name of the CLI download.
+              type: string
+            links:
+              description: links is a list of objects that provide CLI download link
+                details.
+              type: array
+              items:
+                type: object
+                required:
+                  - href
+                properties:
+                  href:
+                    description: href is the absolute secure URL for the link (must
+                      use https)
+                    type: string
+                    pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+                  text:
+                    description: text is the display text for the link
+                    type: string
diff --git a/manifests/00-crd-consoleexternalloglinks.yaml b/manifests/00-crd-consoleexternalloglinks.yaml
@@ -0,0 +1,89 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: consoleexternalloglinks.console.openshift.io
+  annotations:
+    displayName: ConsoleExternalLogLinks
+    description: ConsoleExternalLogLink is an extension for customizing OpenShift
+      web console log links.
+spec:
+  scope: Cluster
+  group: console.openshift.io
+  versions:
+    - name: v1
+      served: true
+      storage: true
+  names:
+    plural: consoleexternalloglinks
+    singular: consoleexternalloglink
+    kind: ConsoleExternalLogLink
+    listKind: ConsoleExternalLogLinkList
+  additionalPrinterColumns:
+    - name: Text
+      type: string
+      JSONPath: .spec.text
+    - name: HrefTemplate
+      type: string
+      JSONPath: .spec.hrefTemplate
+    - name: Age
+      type: date
+      JSONPath: .metadata.creationTimestamp
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: ConsoleExternalLogLink is an extension for customizing OpenShift
+        web console log links.
+      type: object
+      required:
+        - spec
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          description: Standard object's metadata.
+          type: object
+        spec:
+          description: ConsoleExternalLogLinkSpec is the desired log link configuration.
+            The log link will appear on the logs tab of the pod details page.
+          type: object
+          required:
+            - hrefTemplate
+            - text
+          properties:
+            hrefTemplate:
+              description: "hrefTemplate is an absolute secure URL (must use https)
+                for the log link including variables to be replaced. Variables are
+                specified in the URL with the format ${variableName}, for instance,
+                ${containerName} and will be replaced with the corresponding values
+                from the resource. Resource is a pod. Supported variables are:
+                - ${resourceName} - name of the resource which containes the logs
+                - ${resourceUID} - UID of the resource which contains the logs
+                  - e.g. `11111111-2222-3333-4444-555555555555`
+                - ${containerName} - name of the resource's container that contains the logs
+                - ${resourceNamespace} - namespace of the resource that contains the logs
+                - ${resourceNamespaceUID} - namespace UID of the resource that contains the logs
+                - ${podLabels} - JSON representation of labels matching the pod with the logs
+                  - e.g. `{\"key1\":\"value1\",\"key2\":\"value2\"}`
+                e.g., https://example.com/logs?resourceName=${resourceName}&containerName=${containerName}&resourceNamespace=${resourceNamespace}&podLabels=${podLabels}"
+              type: string
+              pattern: ^https://
+            namespaceFilter:
+              description: namespaceFilter is a regular expression used to restrict
+                a log link to a matching set of namespaces (e.g., `^openshift-`).
+                The string is converted into a regular expression using the JavaScript
+                RegExp constructor. If not specified, links will be displayed for
+                all the namespaces.
+              type: string
+            text:
+              description: text is the display text for the link
+              type: string
+
diff --git a/manifests/00-crd-consolelinks.yaml b/manifests/00-crd-consolelinks.yaml
@@ -0,0 +1,112 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: consolelinks.console.openshift.io
+  annotations:
+    displayName: ConsoleLinks
+    description: Extension for customizing OpenShift web console links
+spec:
+  scope: Cluster
+  group: console.openshift.io
+  versions:
+    - name: v1
+      served: true
+      storage: true
+  names:
+    plural: consolelinks
+    singular: consolelink
+    kind: ConsoleLink
+    listKind: ConsoleLinkList
+  additionalPrinterColumns:
+    - name: Text
+      type: string
+      JSONPath: .spec.text
+    - name: URL
+      type: string
+      JSONPath: .spec.href
+    - name: Menu
+      type: string
+      JSONPath: .spec.menu
+    - name: Age
+      type: date
+      JSONPath: .metadata.creationTimestamp
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: ConsoleLink is an extension for customizing OpenShift web console
+        links.
+      type: object
+      required:
+        - spec
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          description: Standard object's metadata.
+          type: object
+        spec:
+          description: ConsoleLinkSpec is the desired console link configuration.
+          type: object
+          required:
+            - href
+            - location
+            - text
+          properties:
+            applicationMenu:
+              description: applicationMenu holds information about section and icon
+                used for the link in the application menu, and it is applicable only
+                when location is set to ApplicationMenu.
+              type: object
+              required:
+                - section
+              properties:
+                imageURL:
+                  description: imageUrl is the URL for the icon used in front of the
+                    link in the application menu. The URL must be an HTTPS URL or
+                    a Data URI. The image should be square and will be shown at 24x24
+                    pixels.
+                  type: string
+                section:
+                  description: section is the section of the application menu in which
+                    the link should appear. This can be any text that will appear
+                    as a subheading in the application menu dropdown. A new section
+                    will be created if the text does not match text of an existing
+                    section.
+                  type: string
+            href:
+              description: href is the absolute secure URL for the link (must use
+                https)
+              type: string
+              pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+            location:
+              description: location determines which location in the console the link
+                will be appended to (ApplicationMenu, HelpMenu, UserMenu, NamespaceDashboard).
+              type: string
+              pattern: ^(ApplicationMenu|HelpMenu|UserMenu|NamespaceDashboard)$
+            namespaceDashboard:
+              description: namespaceDashboard holds information about namespaces in
+                which the dashboard link should appear, and it is applicable only
+                when location is set to NamespaceDashboard. If not specified, the
+                link will appear in all namespaces.
+              type: object
+              required:
+                - namespaces
+              properties:
+                namespaces:
+                  description: namespaces is an array of namespace names in which
+                    the dashboard link should appear.
+                  type: array
+                  items:
+                    type: string
+            text:
+              description: text is the display text for the link
+              type: string