chore: remove deprecate Context field

IBM · Dec 5, 2018 · 7f56ba0 · 7f56ba0
1 parent a1d11f8
commit 7f56ba0
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 521 deletions.
diff --git a/api/swagger/swagger-doc.json b/api/swagger/swagger-doc.json
@@ -47,26 +47,6 @@
      }
     }
    },
-   "lib.ibmcloud.v1.ResourceContext": {
-    "description": "ResourceContext defines the CloudFoundry context and resource group",
-    "properties": {
-     "org": {
-      "type": "string"
-     },
-     "region": {
-      "type": "string"
-     },
-     "resourcegroup": {
-      "type": "string"
-     },
-     "resourcelocation": {
-      "type": "string"
-     },
-     "space": {
-      "type": "string"
-     }
-    }
-   },
    "openwhisk.v1beta1.Composition": {
     "description": "Composition is the Schema for the compositions API",
     "properties": {
@@ -139,10 +119,6 @@
       "description": "The location of the composition to deploy. Support `http(s)` and `file` protocols.",
       "type": "string"
      },
-     "context": {
-      "description": "Where to deploy the composition. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -270,10 +246,6 @@
       "description": "The location of the code to deploy. Support `http(s)` and `file` protocols.",
       "type": "string"
      },
-     "context": {
-      "description": "Where to deploy the function. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -457,10 +429,6 @@
      "function"
     ],
     "properties": {
-     "context": {
-      "description": "Where to deploy the invocation. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -635,10 +603,6 @@
       "description": "Name of the package for which a binding should be created",
       "type": "string"
      },
-     "context": {
-      "description": "Where to deploy the package. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -762,10 +726,6 @@
      "function"
     ],
     "properties": {
-     "context": {
-      "description": "Where to deploy the rule. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -884,10 +844,6 @@
        "$ref": "#/definitions/keyvalue.v1.KeyValue"
       }
      },
-     "context": {
-      "description": "Where to deploy the trigger. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -47,26 +47,6 @@
      }
     }
    },
-   "lib.ibmcloud.v1.ResourceContext": {
-    "description": "ResourceContext defines the CloudFoundry context and resource group",
-    "properties": {
-     "org": {
-      "type": "string"
-     },
-     "region": {
-      "type": "string"
-     },
-     "resourcegroup": {
-      "type": "string"
-     },
-     "resourcelocation": {
-      "type": "string"
-     },
-     "space": {
-      "type": "string"
-     }
-    }
-   },
    "openwhisk.v1beta1.Composition": {
     "description": "Composition is the Schema for the compositions API",
     "properties": {
@@ -139,10 +119,6 @@
       "description": "The location of the composition to deploy. Support `http(s)` and `file` protocols.",
       "type": "string"
      },
-     "context": {
-      "description": "Where to deploy the composition. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -252,10 +228,6 @@
       "description": "The location of the code to deploy. Support `http(s)` and `file` protocols.",
       "type": "string"
      },
-     "context": {
-      "description": "Where to deploy the function. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -414,10 +386,6 @@
      "function"
     ],
     "properties": {
-     "context": {
-      "description": "Where to deploy the invocation. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -574,10 +542,6 @@
       "description": "Name of the package for which a binding should be created",
       "type": "string"
      },
-     "context": {
-      "description": "Where to deploy the package. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -690,10 +654,6 @@
      "function"
     ],
     "properties": {
-     "context": {
-      "description": "Where to deploy the rule. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"
@@ -802,10 +762,6 @@
        "$ref": "#/definitions/keyvalue.v1.KeyValue"
       }
      },
-     "context": {
-      "description": "Where to deploy the trigger. If not specified, the controller reads the wsk properties from `seed-default-owprops` secret in the resource namespace. This secret must defined two keys, `apihost` and `auth` `seed-default-owprops` is automatically created from `seed-defaults` or it can be manually set",
-      "$ref": "#/definitions/lib.ibmcloud.v1.ResourceContext"
-     },
      "contextFrom": {
       "description": "Reference to a secret representing where to deploy this entity Default is `seed-default-owprops` The secret must defines these fields: apihost (string) : The OpenWhisk host auth (string): the authorization key cert (string):  the client certificate (optional) insecure (bool):  Whether or not to bypass certificate checking (optional, default is false)",
       "$ref": "#/definitions/io.k8s.api.core.v1.SecretEnvSource"

diff --git a/config/crds/openwhisk_v1beta1_composition.yaml b/config/crds/openwhisk_v1beta1_composition.yaml
@@ -28,25 +28,6 @@ spec:
               type: string
             compositionURI:
               type: string
-            context:
-              properties:
-                org:
-                  type: string
-                region:
-                  type: string
-                resourcegroup:
-                  type: string
-                resourcelocation:
-                  type: string
-                space:
-                  type: string
-              required:
-              - org
-              - space
-              - region
-              - resourcegroup
-              - resourcelocation
-              type: object
             contextFrom:
               type: object
             name:

diff --git a/config/crds/openwhisk_v1beta1_function.yaml b/config/crds/openwhisk_v1beta1_function.yaml
@@ -46,25 +46,6 @@ spec:
               type: string
             codeURI:
               type: string
-            context:
-              properties:
-                org:
-                  type: string
-                region:
-                  type: string
-                resourcegroup:
-                  type: string
-                resourcelocation:
-                  type: string
-                space:
-                  type: string
-              required:
-              - org
-              - space
-              - region
-              - resourcegroup
-              - resourcelocation
-              type: object
             contextFrom:
               type: object
             docker:

diff --git a/config/crds/openwhisk_v1beta1_invocation.yaml b/config/crds/openwhisk_v1beta1_invocation.yaml
@@ -24,25 +24,6 @@ spec:
           type: object
         spec:
           properties:
-            context:
-              properties:
-                org:
-                  type: string
-                region:
-                  type: string
-                resourcegroup:
-                  type: string
-                resourcelocation:
-                  type: string
-                space:
-                  type: string
-              required:
-              - org
-              - space
-              - region
-              - resourcegroup
-              - resourcelocation
-              type: object
             contextFrom:
               type: object
             finalizer:

diff --git a/config/crds/openwhisk_v1beta1_package.yaml b/config/crds/openwhisk_v1beta1_package.yaml
@@ -44,25 +44,6 @@ spec:
               type: array
             bind:
               type: string
-            context:
-              properties:
-                org:
-                  type: string
-                region:
-                  type: string
-                resourcegroup:
-                  type: string
-                resourcelocation:
-                  type: string
-                space:
-                  type: string
-              required:
-              - org
-              - space
-              - region
-              - resourcegroup
-              - resourcelocation
-              type: object
             contextFrom:
               type: object
             name:

diff --git a/config/crds/openwhisk_v1beta1_rule.yaml b/config/crds/openwhisk_v1beta1_rule.yaml
@@ -24,25 +24,6 @@ spec:
           type: object
         spec:
           properties:
-            context:
-              properties:
-                org:
-                  type: string
-                region:
-                  type: string
-                resourcegroup:
-                  type: string
-                resourcelocation:
-                  type: string
-                space:
-                  type: string
-              required:
-              - org
-              - space
-              - region
-              - resourcegroup
-              - resourcelocation
-              type: object
             contextFrom:
               type: object
             function:

diff --git a/config/crds/openwhisk_v1beta1_trigger.yaml b/config/crds/openwhisk_v1beta1_trigger.yaml
@@ -42,25 +42,6 @@ spec:
                 - name
                 type: object
               type: array
-            context:
-              properties:
-                org:
-                  type: string
-                region:
-                  type: string
-                resourcegroup:
-                  type: string
-                resourcelocation:
-                  type: string
-                space:
-                  type: string
-              required:
-              - org
-              - space
-              - region
-              - resourcegroup
-              - resourcelocation
-              type: object
             contextFrom:
               type: object
             feed: