Skip to content

Commit

Permalink
Make versions.yaml also compiled-in (istio#395)
Browse files Browse the repository at this point in the history
  • Loading branch information
ostromart authored and istio-testing committed Oct 17, 2019
1 parent c63a50f commit c92120c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 13 deletions.
2 changes: 1 addition & 1 deletion cmd/mesh/manifest-versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
)

const (
versionsMapURL = "https://raw.githubusercontent.com/istio/operator/master/version/versions.yaml"
versionsMapURL = "https://raw.githubusercontent.com/istio/operator/master/data/versions.yaml"
)

type manifestVersionsArgs struct {
Expand Down
15 changes: 15 additions & 0 deletions data/versions.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- operatorVersion: 1.3.0
supportedIstioVersions: 1.3.0
recommendedIstioVersions: 1.3.0
- operatorVersion: 1.3.1
supportedIstioVersions: ">=1.3.0,<=1.3.1"
recommendedIstioVersions: 1.3.1
- operatorVersion: 1.3.2
supportedIstioVersions: ">=1.3.0,<=1.3.2"
recommendedIstioVersions: 1.3.2
- operatorVersion: 1.3.3
supportedIstioVersions: ">=1.3.0,<=1.3.3"
recommendedIstioVersions: 1.3.3
- operatorVersion: 1.4.0
supportedIstioVersions: ">=1.3.3, <1.6"
recommendedIstioVersions: 1.4.0
1 change: 0 additions & 1 deletion release/create_release_charts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ function copy_profiles() {
}

function copy_versions_files() {
cp "${OPERATOR_BASE_DIR}/version/version.yaml" "${OUTPUT_DIR}"
cp "${OPERATOR_BASE_DIR}/version/versions.yaml" "${OUTPUT_DIR}"
}

Expand Down
9 changes: 0 additions & 9 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,6 @@ const (
)

var (
// SupportedVersions is a list of chart versions supported by this version of the operator.
// It must be synced with the versions.yaml file.
SupportedVersions = []string{
"1.3.0",
"1.3.1",
"1.3.2",
"1.3.3",
}

// OperatorBinaryVersion is the Istio operator version.
OperatorBinaryVersion pkgversion.Version
// OperatorBinaryGoVersion is the Istio operator version in go-version format.
Expand Down
1 change: 0 additions & 1 deletion version/version.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

const (
operatorVersionsMapFilePath = "./versions.yaml"
operatorVersionsMapFilePath = "../data/versions.yaml"
)

func TestVersions(t *testing.T) {
Expand Down

0 comments on commit c92120c

Please sign in to comment.