Deploy API envoy mgw adapter

BLasan · Jan 4, 2021 · 9250c20 · 9250c20
1 parent 0060e51
commit 9250c20
Show file tree

Hide file tree

Showing 232 changed files with 31,089 additions and 770 deletions.
diff --git a/admissionController/_manifest_.yaml b/admissionController/_manifest_.yaml
@@ -75,7 +75,7 @@ webhooks:
     rules:
       - operations: ["CREATE","UPDATE"]
         apiGroups: ["cache.example.com"]
-        apiVersions: ["v1alpha1"]
+        apiVersions: ["v1alpha2"]
         resources:
           - securities
     failurePolicy: Ignore
diff --git a/admissionController/manifest.yaml b/admissionController/manifest.yaml
@@ -75,7 +75,7 @@ webhooks:
     rules:
       - operations: ["CREATE","UPDATE"]
         apiGroups: ["cache.example.com"]
-        apiVersions: ["v1alpha1"]
+        apiVersions: ["v1alpha2"]
         resources:
           - securities
     failurePolicy: Ignore
diff --git a/admissionController/security.yaml b/admissionController/security.yaml
@@ -1,4 +1,4 @@
-apiVersion: cache.example.com/v1alpha1
+apiVersion: cache.example.com/v1alpha2
 kind: Security
 metadata:
   name: securitytest-example-xi

diff --git a/admissionController/webhook.go b/admissionController/webhook.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	cachev1alpha1 "github.com/Shehanir/k8s-securityOperator/security-operator/pkg/apis/cache/v1alpha1"
+	cachev1alpha1 "github.com/Shehanir/k8s-securityOperator/security-operator/pkg/apis/cache/v1alpha2"
 	"net/http"
 
 	"github.com/golang/glog"

diff --git a/api-operator/deploy/controller-artifacts/operator.yaml b/api-operator/deploy/controller-artifacts/operator.yaml
@@ -32,7 +32,7 @@ spec:
       containers:
         - name: api-operator
           # Replace this with the built image name
-          image: wso2/k8s-api-operator:1.2.2
+          image: jayanieb/envoy-k8s-api-operator:v1.0.0
           command:
           - api-operator
           imagePullPolicy: Always

diff --git a/api-operator/deploy/controller-configs/controller_conf.yaml b/api-operator/deploy/controller-configs/controller_conf.yaml
@@ -344,3 +344,35 @@ data:
   #    namespace: micro
   #  - name: test1secretEnv
   #    asEnvVar: true
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: envoymgw-adapter-secret
+type: Opaque
+data:
+  # Base64 encoded username and password for Envoy MGW Adapter
+  username: YWRtaW4=
+  password: YWRtaW4=
+  mgwCertSecretName: ZW52b3ltZ3ctY2VydC1zZWNyZXQ=
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: envoy-mgw-configs
+data:
+  mgwAdapterHost: "https://adapter-service.default:9843"
+  #Skip verification for Adapter endpoint call. If "false", you need to provide the cert
+  mgwInsecureSkipVerify: "true"
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: envoymgw-cert-secret
+data:
+  #Base64 encoded public cert of Envoy MGW Adapter
+  adapter.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR4VENDQXEyZ0F3SUJBZ0lVRG8xdUJKT1lQN2lMbXM5WnhWQ0YxQ1J1YldRd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2NqRUxNQWtHQTFVRUJoTUNWVk14Q3pBSkJnTlZCQWdNQWtOQk1SWXdGQVlEVlFRSERBMU5iM1Z1ZEdGcApiaUJXYVdWM01RMHdDd1lEVlFRS0RBUlhVMDh5TVEwd0N3WURWUVFMREFSWFUwOHlNU0F3SGdZRFZRUUREQmRoClpHRndkR1Z5TFhObGNuWnBZMlV1WkdWbVlYVnNkREFlRncweU1ERXhNalF4TXpJME5UVmFGdzB5TXpBeU1ESXgKTXpJME5UVmFNSEl4Q3pBSkJnTlZCQVlUQWxWVE1Rc3dDUVlEVlFRSURBSkRRVEVXTUJRR0ExVUVCd3dOVFc5MQpiblJoYVc0Z1ZtbGxkekVOTUFzR0ExVUVDZ3dFVjFOUE1qRU5NQXNHQTFVRUN3d0VWMU5QTWpFZ01CNEdBMVVFCkF3d1hZV1JoY0hSbGNpMXpaWEoyYVdObExtUmxabUYxYkhRd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUIKRHdBd2dnRUtBb0lCQVFDZHQyT3hVaGZocWNlc0QrcU5TRXgxNUhRVGx0U0Q2Z2VSbUVQME1NQnViY2pHdm16UgpveTdmVyt0UHV5WlliR0M0ZjRFSGRPRzBma0FZK0hBK256b1RXYVNBNm9heVVPZzlGbXloMDNHN0FEbnlKRENICnVoMW1NUXpHdkJVL2hrTnpramdDcHNCaFlWaWd4NGFQTE9IUmZHSkk2TGtQMWtWbWRuR1lEbERkdUEyRTAyQnEKamFjN0E3Nlc5YWplMGlUaGRBcE9ZYS82VDRQajU3bnIyQnZXNkthT2tMTlEvZjljdm41NW01RW1oL0NISExVMQpUWTlTTUtsZVUzZWdzeTBjS2dVLzYvSXFFWjBrVFBFaDdxTk1oaDZHa1FsMWlUN0JNMGJlalo5YjlVMS9rVTJoCkZLb0VEY1FHa3FSOUhBWkgxaUY1M0o2M0UwLzB3ZE9wa280WEFnTUJBQUdqVXpCUk1CMEdBMVVkRGdRV0JCU2cKeVNpMXpXbnpTOXBySGp2TmdURHVHa1VMRlRBZkJnTlZIU01FR0RBV2dCU2d5U2kxelduelM5cHJIanZOZ1REdQpHa1VMRlRBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCM2Urb3JMajIxCkxiMldPMGtXbDVXV1F5aHZWZ0hHVGYvSzRJa1RzYzdrWnM0THdNWlBhaXN1SGVTQklGVm4zRFRTQmRaaHJ6UUMKQTBCS1dKcjZxakxkVW5YbGhTWWsxbWhTOG4zN1NZclVwWEpJNGxTQlpsdGwwdmxiT1ZZbjFMNUlEcWRCMUdjKwp4amFoVzNIc3NPNGhWRTdPa0s3dFZlYmVWdHUyRjNPZmFMaW1nNGdtaFVUSE12WkVVTGlkUUFqVzJkcUkwVzRQCnpUWmJjdjFxNGNGZ05aVU9QbkhvWTM1UmkwSGI2U25nQ3RGV09DWVA4c3ZkdHVoV0J5ZFdtNmx5ME1EOEZxVTkKUk1iK0NlK3B0RlR2UFFmT0o0bjhxTUpUTnAwaGJ3OXlNUnhpWlhXbFQzNkZROGlOd1VMdFFYcFJTVlp6Yzg0KwpVLy8vOEZ6aVE3MTMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ==
+type: Opaque
diff --git a/api-operator/deploy/controller-configs/default_security_cr.yaml b/api-operator/deploy/controller-configs/default_security_cr.yaml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: Security
 metadata:
   name: default-security-jwt

diff --git a/api-operator/deploy/crds/wso2.com_apis_crd.yaml b/api-operator/deploy/crds/wso2.com_apis_crd.yaml
@@ -116,6 +116,10 @@ spec:
             replicas:
               description: Replica count of the API.
               type: integer
+            swaggerConfigMapName:
+              description: Config map name of which the project zip or swagger file
+                is included
+              type: string
             updateTimeStamp:
               description: Update API definition creating a new docker image. Make
                 a rolling update to the existing API. with prefixing the timestamp
@@ -126,8 +130,7 @@ spec:
                 will be overridden by this value. Default value "<empty>".
               type: string
           required:
-          - definition
-          - replicas
+          - swaggerConfigMapName
           type: object
         status:
           description: APIStatus defines the observed state of API
@@ -141,8 +144,8 @@ spec:
           - replicas
           type: object
       type: object
-  version: v1alpha1
+  version: v1alpha2
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     served: true
     storage: true
diff --git a/api-operator/deploy/crds/wso2.com_integrations_crd.yaml b/api-operator/deploy/crds/wso2.com_integrations_crd.yaml
@@ -245,8 +245,8 @@ spec:
           - serviceName
           type: object
       type: object
-  version: v1alpha1
+  version: v1alpha2
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     served: true
     storage: true
diff --git a/api-operator/deploy/crds/wso2.com_ratelimitings_crd.yaml b/api-operator/deploy/crds/wso2.com_ratelimitings_crd.yaml
@@ -1,19 +1,3 @@
-#Copyright (c)  WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# WSO2 Inc. licenses this file to you under the Apache License,
-# Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -113,14 +97,18 @@ spec:
             unitTime:
               type: integer
           required:
+          - bandwidth
+          - conditions
+          - description
           - requestCount
+          - stopOnQuotaReach
           - timeUnit
           - type
           - unitTime
           type: object
       type: object
-  version: v1alpha1
+  version: v1alpha2
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     served: true
     storage: true
diff --git a/api-operator/deploy/crds/wso2.com_securities_crd.yaml b/api-operator/deploy/crds/wso2.com_securities_crd.yaml
@@ -33,6 +33,7 @@ spec:
     plural: securities
     singular: security
   scope: Namespaced
+  subresources: {}
   validation:
     openAPIV3Schema:
       description: Security is the Schema for the securities API
@@ -80,14 +81,15 @@ spec:
                 https://book.kubebuilder.io/beyond_basics/generating_crd.html'
               type: string
           required:
+          - securityConfig
           - type
           type: object
         status:
           description: SecurityStatus defines the observed state of Security
           type: object
       type: object
-  version: v1alpha1
+  version: v1alpha2
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     served: true
     storage: true
diff --git a/api-operator/deploy/crds/wso2.com_targetendpoints_crd.yaml b/api-operator/deploy/crds/wso2.com_targetendpoints_crd.yaml
@@ -112,8 +112,8 @@ spec:
           description: TargetEndpointStatus defines the observed state of TargetEndpoint
           type: object
       type: object
-  version: v1alpha1
+  version: v1alpha2
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     served: true
     storage: true
diff --git a/api-operator/deploy/sample-definitions/security_definitions.yaml b/api-operator/deploy/sample-definitions/security_definitions.yaml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: Security
 metadata:
   name: petstoreoauth
@@ -27,7 +27,7 @@ spec:
       credentials: oauth-credentials
 
 ---
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: Security
 metadata:
   name: petstorebasic
@@ -38,7 +38,7 @@ spec:
     - credentials: secret-basic
 
 ---
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: Security
 metadata:
   name: petstorejwt
@@ -53,7 +53,7 @@ spec:
       validateSubscription: false
 
 ---
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: Security
 metadata:
   name: petstoreapikey

diff --git a/api-operator/deploy/sample-definitions/wso2_v1alpha1_api_cr.yaml b/api-operator/deploy/sample-definitions/wso2_v1alpha1_api_cr.yaml
@@ -1,4 +1,4 @@
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: API
 metadata:
   name: test-api-publisher

diff --git a/api-operator/deploy/sample-definitions/wso2_v1alpha1_integration_cr.yaml b/api-operator/deploy/sample-definitions/wso2_v1alpha1_integration_cr.yaml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: Integration
 metadata:
   name: test-integration

diff --git a/api-operator/deploy/sample-definitions/wso2_v1alpha1_ratelimiting_cr.yaml b/api-operator/deploy/sample-definitions/wso2_v1alpha1_ratelimiting_cr.yaml
@@ -1,4 +1,4 @@
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: RateLimiting
 metadata:
   name: testing1ratelimiting

diff --git a/api-operator/deploy/sample-definitions/wso2_v1alpha1_targetendpoint_cr.yaml b/api-operator/deploy/sample-definitions/wso2_v1alpha1_targetendpoint_cr.yaml
@@ -1,4 +1,4 @@
-apiVersion: wso2.com/v1alpha1
+apiVersion: wso2.com/v1alpha2
 kind: TargetEndpoint
 metadata:
   name: products-privatejet

diff --git a/api-operator/go.mod b/api-operator/go.mod
@@ -3,16 +3,20 @@ module github.com/wso2/k8s-api-operator/api-operator
 go 1.13
 
 require (
+	github.com/Jeffail/gabs v1.4.0
 	github.com/aws/aws-sdk-go v1.29.3
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/emicklei/go-restful v2.13.0+incompatible // indirect
 	github.com/getkin/kin-openapi v0.2.0
+	github.com/ghodss/yaml v1.0.0
+	github.com/go-openapi/loads v0.19.4
 	github.com/go-openapi/spec v0.19.4
 	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/heroku/docker-registry-client v0.0.0-20181004091502-47ecf50fd8d4
 	github.com/json-iterator/go v1.1.10 // indirect
+	github.com/mitchellh/mapstructure v1.1.2
 	github.com/openshift/api v3.9.0+incompatible
 	github.com/operator-framework/operator-sdk v0.18.0
 	github.com/sirupsen/logrus v1.5.0

diff --git a/api-operator/go.sum b/api-operator/go.sum
@@ -69,6 +69,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo=
+github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
@@ -126,6 +128,7 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0=
 github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
 github.com/aws/aws-sdk-go v0.0.0-20180507225419-00862f899353/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
@@ -375,10 +378,12 @@ github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpR
 github.com/go-openapi/analysis v0.17.2/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
 github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
 github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-openapi/analysis v0.19.5 h1:8b2ZgKfKIUTVQpTb77MoRDIMEIwvDVw40o3aOXdfYzI=
 github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
 github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
 github.com/go-openapi/errors v0.17.2/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
 github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=
 github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
@@ -403,6 +408,7 @@ github.com/go-openapi/loads v0.17.2/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf
 github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
+github.com/go-openapi/loads v0.19.4 h1:5I4CCSqoWzT+82bBkNIvmLc0UOsoKKQ4Fz+3VxOB7SY=
 github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk=
 github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
 github.com/go-openapi/runtime v0.17.2/go.mod h1:QO936ZXeisByFmZEO1IS1Dqhtf4QV1sYYFtIq6Ld86Q=
@@ -425,6 +431,7 @@ github.com/go-openapi/strfmt v0.17.2/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pL
 github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
 github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
+github.com/go-openapi/strfmt v0.19.3 h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA=
 github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
@@ -444,6 +451,7 @@ github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85n
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobuffalo/envy v1.6.5/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ=
 github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
@@ -797,6 +805,7 @@ github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:
 github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
@@ -1182,6 +1191,7 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=

diff --git a/api-operator/pkg/apim/deleteAPI.go b/api-operator/pkg/apim/deleteAPI.go
@@ -19,7 +19,7 @@ package apim
 import (
 	"strings"
 
-	wso2v1alpha1 "github.com/wso2/k8s-api-operator/api-operator/pkg/apis/wso2/v1alpha1"
+	wso2v1alpha1 "github.com/wso2/k8s-api-operator/api-operator/pkg/apis/wso2/v1alpha2"
 	"github.com/wso2/k8s-api-operator/api-operator/pkg/k8s"
 	"github.com/wso2/k8s-api-operator/api-operator/pkg/maps"
 	corev1 "k8s.io/api/core/v1"

diff --git a/api-operator/pkg/apim/importAPI.go b/api-operator/pkg/apim/importAPI.go
@@ -27,7 +27,7 @@ import (
 	"strconv"
 	"strings"
 
-	wso2v1alpha1 "github.com/wso2/k8s-api-operator/api-operator/pkg/apis/wso2/v1alpha1"
+	wso2v1alpha1 "github.com/wso2/k8s-api-operator/api-operator/pkg/apis/wso2/v1alpha2"
 	"github.com/wso2/k8s-api-operator/api-operator/pkg/k8s"
 	"github.com/wso2/k8s-api-operator/api-operator/pkg/maps"
 	corev1 "k8s.io/api/core/v1"

diff --git a/api-operator/pkg/apis/addtoscheme_wso2_v1alpha1.go b/api-operator/pkg/apis/addtoscheme_wso2_v1alpha1.go
@@ -1,10 +1,10 @@
 package apis
 
 import (
-	"github.com/wso2/k8s-api-operator/api-operator/pkg/apis/wso2/v1alpha1"
+	"github.com/wso2/k8s-api-operator/api-operator/pkg/apis/wso2/v1alpha2"
 )
 
 func init() {
 	// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
-	AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme)
+	AddToSchemes = append(AddToSchemes, v1alpha2.SchemeBuilder.AddToScheme)
 }