Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

Make versions.yaml also compiled-in #395

Merged
merged 1 commit into from Oct 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/mesh/manifest-versions.go
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
@@ -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"
elfinhe marked this conversation as resolved.
Show resolved Hide resolved
recommendedIstioVersions: 1.4.0
1 change: 0 additions & 1 deletion release/create_release_charts.sh
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
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
Expand Up @@ -24,7 +24,7 @@ import (
)

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

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