Skip to content

Commit

Permalink
Merge pull request #252 from renuka-fernando/install-urls
Browse files Browse the repository at this point in the history
Update k8s operator urls
  • Loading branch information
npamudika authored Apr 1, 2020
2 parents 784f016 + 449e1bc commit 1171f85
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion import-export-cli/cmd/addApi.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"github.com/ghodss/yaml"
"github.com/spf13/cobra"
wso2v1alpha1 "github.com/wso2/k8s-apim-operator/apim-operator/pkg/apis/wso2/v1alpha1"
wso2v1alpha1 "github.com/wso2/k8s-api-operator/api-operator/pkg/apis/wso2/v1alpha1"
"github.com/wso2/product-apim-tooling/import-export-cli/box"
k8sUtils "github.com/wso2/product-apim-tooling/import-export-cli/operator/utils"
"github.com/wso2/product-apim-tooling/import-export-cli/utils"
Expand Down
2 changes: 1 addition & 1 deletion import-export-cli/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/spf13/cast v1.2.0
github.com/spf13/cobra v0.0.3
github.com/stretchr/testify v1.4.0
github.com/wso2/k8s-apim-operator/apim-operator v0.0.0-20200321092350-0205cf84c08c
github.com/wso2/k8s-api-operator/api-operator v0.0.0-20200401060926-f007c2f3cfb3
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8
gopkg.in/yaml.v2 v2.2.8
k8s.io/apimachinery v0.0.0-20190913075813-344bcc0201c9 // indirect
Expand Down
3 changes: 3 additions & 0 deletions import-export-cli/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,9 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=
github.com/valyala/quicktemplate v1.1.1/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4=
github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
github.com/wso2/k8s-api-operator v1.0.1 h1:na2r7LoyLDj+lO8558Aq+9fqG6LykhwttAmQWB+gS3k=
github.com/wso2/k8s-api-operator/api-operator v0.0.0-20200401060926-f007c2f3cfb3 h1:7pwJIGWTqvJRgbGzqy+DalE2qmWrSeSAGEqH3N75yUI=
github.com/wso2/k8s-api-operator/api-operator v0.0.0-20200401060926-f007c2f3cfb3/go.mod h1:yOoFabyChZn8ueA5QZt0XqVUox41XfmPt8tCJ060+cc=
github.com/wso2/k8s-apim-operator v0.0.0-20190906090738-fc77c27673ce h1:ADEoGtxq7K/7loRxqF9EchoMIoZFL8kUt7nJ7z1Gwvs=
github.com/wso2/k8s-apim-operator v0.0.0-20190906090738-fc77c27673ce/go.mod h1:bzltphF0ElBW6n+4Ti6AHxKezZdv9yUslZtdZKq4dSA=
github.com/wso2/k8s-apim-operator v1.0.0-beta h1:k950oMxmsoN9VIJrsDQ59vpsOVQeLLiqkKuGyo7lB+o=
Expand Down
12 changes: 6 additions & 6 deletions import-export-cli/operator/utils/consts.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ const ApiOpCrdSecurity = "securities.wso2.com"
const ApiOpCrdTargetEndpoint = "targetendpoints.wso2.com"

// API Operator version
const ApiOperatorConfigsUrlTemplate = "https://github.com/wso2/K8s-api-operator/releases/download/%s/api-operator-configs.yaml"
const ApiOperatorVersionValidationUrlTemplate = "https://github.com/wso2/K8s-api-operator/tree/%s"
const ApiOperatorFindVersionUrl = "https://github.com/wso2/K8s-api-operator/releases"
const ApiOperatorConfigsUrlTemplate = "https://github.com/wso2/k8s-api-operator/releases/download/%s/api-operator-configs.yaml"
const ApiOperatorVersionValidationUrlTemplate = "https://github.com/wso2/k8s-api-operator/tree/%s"
const ApiOperatorFindVersionUrl = "https://github.com/wso2/k8s-api-operator/releases"
const DefaultApiOperatorVersion = "v1.1.0"
const ApiOperatorVersionEnvVariable = "WSO2_API_OPERATOR_VERSION"

Expand All @@ -55,9 +55,9 @@ const Wso2amOperator = "wso2am-operator"
const Wso2amOpCrdApimanager = "apimanagers.apim.wso2.com"

// WSO2 AM Operator version
const Wso2AmOperatorConfigsUrlTemplate = "https://github.com/wso2/K8s-wso2am-operator/releases/download/%s/wso2am-operator-configs.yaml"
const Wso2AmOperatorVersionValidationUrlTemplate = "https://github.com/wso2/K8s-wso2am-operator/tree/%s"
const Wso2AmOperatorFindVersionUrl = "https://github.com/wso2/K8s-wso2am-operator/releases"
const Wso2AmOperatorConfigsUrlTemplate = "https://github.com/wso2/k8s-wso2am-operator/releases/download/%s/wso2am-operator-configs.yaml"
const Wso2AmOperatorVersionValidationUrlTemplate = "https://github.com/wso2/k8s-wso2am-operator/tree/%s"
const Wso2AmOperatorFindVersionUrl = "https://github.com/wso2/k8s-wso2am-operator/releases"
const DefaultWso2AmOperatorVersion = "v1.0.0"
const Wso2AmOperatorVersionEnvVariable = "WSO2_AM_OPERATOR_VERSION"

Expand Down

0 comments on commit 1171f85

Please sign in to comment.