From 97f66fb871efabe6aa597d65e4d7947317e18e2e Mon Sep 17 00:00:00 2001 From: llcao Date: Sat, 28 Sep 2019 22:57:11 -0700 Subject: [PATCH 1/4] update version. --- cmd/manager/root.go | 2 + cmd/mesh/manifest-versions.go | 4 + data/translateConfig/translateConfig-1.3.yaml | 212 ------------------ version/version.go | 10 + version/version.yaml | 1 + 5 files changed, 17 insertions(+), 212 deletions(-) delete mode 100644 data/translateConfig/translateConfig-1.3.yaml create mode 100644 version/version.yaml diff --git a/cmd/manager/root.go b/cmd/manager/root.go index 48704d5a3..302dffca0 100644 --- a/cmd/manager/root.go +++ b/cmd/manager/root.go @@ -21,6 +21,7 @@ import ( "github.com/spf13/cobra" + binversion "istio.io/operator/version" "istio.io/pkg/collateral" "istio.io/pkg/version" ) @@ -40,6 +41,7 @@ func getRootCmd(args []string) *cobra.Command { rootCmd.AddCommand(serverCmd()) rootCmd.AddCommand(version.CobraCommand()) + version.Info.Version = binversion.OperatorVersionString rootCmd.AddCommand(collateral.CobraCommand(rootCmd, &doc.GenManHeader{ Title: "Istio Operator", Section: "operator CLI", diff --git a/cmd/mesh/manifest-versions.go b/cmd/mesh/manifest-versions.go index 7bb5a2ccf..50c290fdc 100644 --- a/cmd/mesh/manifest-versions.go +++ b/cmd/mesh/manifest-versions.go @@ -30,7 +30,11 @@ import ( ) const ( +<<<<<<< HEAD versionsMapURL = "https://raw.githubusercontent.com/istio/operator/master/data/versions.yaml" +======= + versionsMapURL = "https://raw.githubusercontent.com/morvencao/operator/br_update_versions_map/version/versions.yaml" +>>>>>>> update version. ) type manifestVersionsArgs struct { diff --git a/data/translateConfig/translateConfig-1.3.yaml b/data/translateConfig/translateConfig-1.3.yaml deleted file mode 100644 index 510b4c13f..000000000 --- a/data/translateConfig/translateConfig-1.3.yaml +++ /dev/null @@ -1,212 +0,0 @@ -apiMapping: - Hub: - outPath: "global.hub" - Tag: - outPath: "global.tag" - K8SDefaults: - outPath: "global.resources" - DefaultNamespace: - outPath: "global.istioNamespace" - Values.Proxy: - outPath: "global.proxy" - ConfigManagement.Components.Namespace: - outPath: "global.configNamespace" - Policy.Components.Namespace: - outPath: "global.policyNamespace" - Telemetry.Components.Namespace: - outPath: "global.telemetryNamespace" - Security.Components.Namespace: - outPath: "global.securityNamespace" -kubernetesMapping: - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Affinity": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].affinity" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Env": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].env" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.HpaSpec": - outPath: "[HorizontalPodAutoscaler:{{.ResourceName}}].spec" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.ImagePullPolicy": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].imagePullPolicy" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.NodeSelector": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.nodeSelector" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.PodDisruptionBudget": - outPath: "[PodDisruptionBudget:{{.ResourceName}}].spec" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.PodAnnotations": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.metadata.annotations" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.PriorityClassName": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.priorityClassName." - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.ReadinessProbe": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].readinessProbe" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.ReplicaCount": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.replicas" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Resources": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].resources" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Strategy": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.strategy" - "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Tolerations": - outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.tolerations" -toFeature: - crds: Base - Pilot: TrafficManagement - Galley: ConfigManagement - Injector: AutoInjection - Policy: Policy - Telemetry: Telemetry - Citadel: Security - CertManager: Security - NodeAgent: Security - IngressGateway: Gateways - EgressGateway: Gateways - Cni: Cni - Grafana: ThirdParty - Prometheus: ThirdParty - Tracing: ThirdParty - PrometheusOperator: ThirdParty - Kiali: ThirdParty -globalNamespaces: - Pilot: "istioNamespace" - Galley: "configNamespace" - Telemetry: "telemetryNamespace" - Policy: "policyNamespace" - Prometheus: "prometheusNamespace" - Citadel: "securityNamespace" -featureMaps: - Base: - alwaysEnabled: true - Components: - - crds - TrafficManagement: - Components: - - Pilot - Policy: - Components: - - Policy - Telemetry: - Components: - - Telemetry - Security: - Components: - - Citadel - - CertManager - - NodeAgent - ConfigManagement: - Components: - - Galley - AutoInjection: - Components: - - Injector - Gateways: - Components: - - IngressGateway - - EgressGateway - Cni: - Components: - - Cni - ThirdParty: - Components: - - Grafana - - Prometheus - - Tracing - - PrometheusOperator - - Kiali - -componentMaps: - crds: - ToHelmValuesTreeRoot: "global" - HelmSubdir: "crds" - AlwaysEnabled: true - Pilot: - ResourceType: "Deployment" - ResourceName: "istio-pilot" - ContainerName: "discovery" - HelmSubdir: "istio-control/istio-discovery" - ToHelmValuesTreeRoot: "pilot" - Galley: - ResourceType: "Deployment" - ResourceName: "istio-galley" - ContainerName: "galley" - HelmSubdir: "istio-control/istio-config" - ToHelmValuesTreeRoot: "galley" - Injector: - ResourceType: "Deployment" - ResourceName: "istio-sidecar-injector" - ContainerName: "sidecar-injector-webhook" - HelmSubdir: "istio-control/istio-autoinject" - ToHelmValuesTreeRoot: "sidecarInjectorWebhook" - Policy: - ResourceType: "Deployment" - ResourceName: "istio-policy" - ContainerName: "mixer" - HelmSubdir: "istio-policy" - ToHelmValuesTreeRoot: "mixer.policy" - Telemetry: - ResourceType: "Deployment" - ResourceName: "istio-telemetry" - ContainerName: "mixer" - HelmSubdir: "istio-telemetry/mixer-telemetry" - ToHelmValuesTreeRoot: "mixer.telemetry" - Citadel: - ResourceType: "Deployment" - ResourceName: "istio-citadel" - ContainerName: "citadel" - HelmSubdir: "security/citadel" - ToHelmValuesTreeRoot: "security" - NodeAgent: - ResourceType: "DaemonSet" - ResourceName: "istio-nodeagent" - ContainerName: "nodeagent" - HelmSubdir: "security/nodeagent" - ToHelmValuesTreeRoot: "nodeagent" - CertManager: - ResourceType: "Deployment" - ResourceName: "certmanager" - ContainerName: "certmanager" - HelmSubdir: "security/certmanager" - ToHelmValuesTreeRoot: "certmanager" - IngressGateway: - ResourceType: "Deployment" - ResourceName: "istio-ingressgateway" - ContainerName: "istio-proxy" - HelmSubdir: "gateways/istio-ingress" - ToHelmValuesTreeRoot: "gateways.istio-ingressgateway" - EgressGateway: - ResourceType: "Deployment" - ResourceName: "istio-egressgateway" - ContainerName: "istio-proxy" - HelmSubdir: "gateways/istio-egress" - ToHelmValuesTreeRoot: "gateways.istio-egressgateway" - Cni: - ResourceType: "DaemonSet" - ResourceName: "istio-cni-node" - ContainerName: "install-cni" - HelmSubdir: "istio-cni" - ToHelmValuesTreeRoot: "cni" - Tracing: - ResourceType: "Deployment" - ResourceName: "istio-tracing" - ContainerName: "jaeger" - HelmSubdir: "istio-telemetry/tracing" - ToHelmValuesTreeRoot: "tracing.jaeger" - PrometheusOperator: - ResourceType: "Deployment" - ResourceName: "prometheus" - ContainerName: "prometheus" - HelmSubdir: "istio-telemetry/prometheus-operator" - ToHelmValuesTreeRoot: "prometheus" - Kiali: - ResourceType: "Deployment" - ResourceName: "kiali" - ContainerName: "kiali" - HelmSubdir: "istio-telemetry/kiali" - ToHelmValuesTreeRoot: "kiali" - Grafana: - ResourceType: "Deployment" - ResourceName: "grafana" - ContainerName: "grafana" - HelmSubdir: "istio-telemetry/grafana" - ToHelmValuesTreeRoot: "grafana" - Prometheus: - ResourceType: "Deployment" - ResourceName: "prometheus" - ContainerName: "prometheus" - HelmSubdir: "istio-telemetry/prometheus" - ToHelmValuesTreeRoot: "prometheus" diff --git a/version/version.go b/version/version.go index 61307096b..fa4727e23 100644 --- a/version/version.go +++ b/version/version.go @@ -26,6 +26,16 @@ const ( ) var ( +<<<<<<< HEAD +======= + // 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.4.0", + } + +>>>>>>> update version. // OperatorBinaryVersion is the Istio operator version. OperatorBinaryVersion pkgversion.Version // OperatorBinaryGoVersion is the Istio operator version in go-version format. diff --git a/version/version.yaml b/version/version.yaml new file mode 100644 index 000000000..88c5fb891 --- /dev/null +++ b/version/version.yaml @@ -0,0 +1 @@ +1.4.0 From 62c96eeffaec7d34e8c3922697d3c41cdc03aa70 Mon Sep 17 00:00:00 2001 From: llcao Date: Sat, 28 Sep 2019 23:29:30 -0700 Subject: [PATCH 2/4] fix test. --- cmd/mesh/manifest-migrate.go | 2 +- pkg/translate/translate_test.go | 4 ++-- pkg/translate/translate_value.go | 2 +- pkg/translate/translate_value_test.go | 2 +- pkg/vfs/assets.gen.go | 23 +++++++++++++++++------ 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/cmd/mesh/manifest-migrate.go b/cmd/mesh/manifest-migrate.go index a086b3b9c..0d80b1e12 100644 --- a/cmd/mesh/manifest-migrate.go +++ b/cmd/mesh/manifest-migrate.go @@ -84,7 +84,7 @@ func migrateFromFiles(rootArgs *rootArgs, args []string, l *logger) { // translateFunc translates the input values and output the result func translateFunc(values []byte, l *logger) { - ts, err := translate.NewReverseTranslator(version.NewMinorVersion(1, 3)) + ts, err := translate.NewReverseTranslator(version.NewMinorVersion(1, 4)) if err != nil { l.logAndFatal("error creating values.yaml translator: ", err.Error()) } diff --git a/pkg/translate/translate_test.go b/pkg/translate/translate_test.go index bca481030..c502a8393 100644 --- a/pkg/translate/translate_test.go +++ b/pkg/translate/translate_test.go @@ -24,7 +24,7 @@ import ( "istio.io/operator/pkg/version" ) -func TestProtoToValuesV13(t *testing.T) { +func TestProtoToValuesV14(t *testing.T) { tests := []struct { desc string yamlStr string @@ -165,7 +165,7 @@ tracing: }, } - tr, err := NewTranslator(version.NewMinorVersion(1, 3)) + tr, err := NewTranslator(version.NewMinorVersion(1, 4)) if err != nil { t.Fatal(err) } diff --git a/pkg/translate/translate_value.go b/pkg/translate/translate_value.go index 1bde4bf30..db9f38130 100644 --- a/pkg/translate/translate_value.go +++ b/pkg/translate/translate_value.go @@ -46,7 +46,7 @@ type ReverseTranslator struct { var ( // ReverseTranslators maps a minor version to a corresponding ReverseTranslator. ReverseTranslators = map[version.MinorVersion]*ReverseTranslator{ - version.NewMinorVersion(1, 3): { + version.NewMinorVersion(1, 4): { APIMapping: map[string]*Translation{}, KubernetesPatternMapping: map[string]string{ "{{.ValueComponentName}}.podAntiAffinityLabelSelector": "{{.FeatureName}}.Components.{{.ComponentName}}.K8s." + diff --git a/pkg/translate/translate_value_test.go b/pkg/translate/translate_value_test.go index b1ad2fee5..8a48ec307 100644 --- a/pkg/translate/translate_value_test.go +++ b/pkg/translate/translate_value_test.go @@ -372,7 +372,7 @@ autoInjection: `, }, } - tr, err := NewReverseTranslator(version.NewMinorVersion(1, 3)) + tr, err := NewReverseTranslator(version.NewMinorVersion(1, 4)) if err != nil { t.Fatal("fail to get helm value.yaml translator") } diff --git a/pkg/vfs/assets.gen.go b/pkg/vfs/assets.gen.go index 0298a6858..b87402487 100644 --- a/pkg/vfs/assets.gen.go +++ b/pkg/vfs/assets.gen.go @@ -215,9 +215,13 @@ // ../../data/profiles/demo.yaml // ../../data/profiles/minimal.yaml // ../../data/profiles/sds.yaml +<<<<<<< HEAD // ../../data/translateConfig/translateConfig-1.3.yaml // ../../data/translateConfig/translateConfig-1.4.yaml // ../../data/versions.yaml +======= +// ../../data/translateConfig/translateConfig-1.4.yaml +>>>>>>> fix test. // DO NOT EDIT! package vfs @@ -32895,7 +32899,7 @@ func profilesSdsYaml() (*asset, error) { return a, nil } -var _translateconfigTranslateconfig13Yaml = []byte(`apiMapping: +var _translateconfigTranslateconfig14Yaml = []byte(`apiMapping: Hub: outPath: "global.hub" Tag: @@ -33109,17 +33113,17 @@ componentMaps: ToHelmValuesTreeRoot: "prometheus" `) -func translateconfigTranslateconfig13YamlBytes() ([]byte, error) { - return _translateconfigTranslateconfig13Yaml, nil +func translateconfigTranslateconfig14YamlBytes() ([]byte, error) { + return _translateconfigTranslateconfig14Yaml, nil } -func translateconfigTranslateconfig13Yaml() (*asset, error) { - bytes, err := translateconfigTranslateconfig13YamlBytes() +func translateconfigTranslateconfig14Yaml() (*asset, error) { + bytes, err := translateconfigTranslateconfig14YamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "translateConfig/translateConfig-1.3.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + info := bindataFileInfo{name: "translateConfig/translateConfig-1.4.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -33652,9 +33656,13 @@ var _bindata = map[string]func() (*asset, error){ "profiles/demo.yaml": profilesDemoYaml, "profiles/minimal.yaml": profilesMinimalYaml, "profiles/sds.yaml": profilesSdsYaml, +<<<<<<< HEAD "translateConfig/translateConfig-1.3.yaml": translateconfigTranslateconfig13Yaml, "translateConfig/translateConfig-1.4.yaml": translateconfigTranslateconfig14Yaml, "versions.yaml": versionsYaml, +======= + "translateConfig/translateConfig-1.4.yaml": translateconfigTranslateconfig14Yaml, +>>>>>>> fix test. } // AssetDir returns the file names below a certain @@ -34007,7 +34015,10 @@ var _bintree = &bintree{nil, map[string]*bintree{ "sds.yaml": &bintree{profilesSdsYaml, map[string]*bintree{}}, }}, "translateConfig": &bintree{nil, map[string]*bintree{ +<<<<<<< HEAD "translateConfig-1.3.yaml": &bintree{translateconfigTranslateconfig13Yaml, map[string]*bintree{}}, +======= +>>>>>>> fix test. "translateConfig-1.4.yaml": &bintree{translateconfigTranslateconfig14Yaml, map[string]*bintree{}}, }}, "versions.yaml": &bintree{versionsYaml, map[string]*bintree{}}, From 817cbcee871ffe1aaade4b44dc47d71fba1b2780 Mon Sep 17 00:00:00 2001 From: morvencao Date: Wed, 9 Oct 2019 12:12:12 +0800 Subject: [PATCH 3/4] apply comments. --- cmd/mesh/manifest-migrate.go | 2 +- cmd/mesh/manifest-versions.go | 4 ++++ .../{translateConfig-1.4.yaml => translateConfig-1.3.yaml} | 0 pkg/translate/translate_test.go | 4 ++-- pkg/translate/translate_value.go | 2 +- pkg/translate/translate_value_test.go | 2 +- version/version.go | 1 + 7 files changed, 10 insertions(+), 5 deletions(-) rename data/translateConfig/{translateConfig-1.4.yaml => translateConfig-1.3.yaml} (100%) diff --git a/cmd/mesh/manifest-migrate.go b/cmd/mesh/manifest-migrate.go index 0d80b1e12..a086b3b9c 100644 --- a/cmd/mesh/manifest-migrate.go +++ b/cmd/mesh/manifest-migrate.go @@ -84,7 +84,7 @@ func migrateFromFiles(rootArgs *rootArgs, args []string, l *logger) { // translateFunc translates the input values and output the result func translateFunc(values []byte, l *logger) { - ts, err := translate.NewReverseTranslator(version.NewMinorVersion(1, 4)) + ts, err := translate.NewReverseTranslator(version.NewMinorVersion(1, 3)) if err != nil { l.logAndFatal("error creating values.yaml translator: ", err.Error()) } diff --git a/cmd/mesh/manifest-versions.go b/cmd/mesh/manifest-versions.go index 50c290fdc..6c7aa1b54 100644 --- a/cmd/mesh/manifest-versions.go +++ b/cmd/mesh/manifest-versions.go @@ -30,11 +30,15 @@ import ( ) const ( +<<<<<<< HEAD <<<<<<< HEAD versionsMapURL = "https://raw.githubusercontent.com/istio/operator/master/data/versions.yaml" ======= versionsMapURL = "https://raw.githubusercontent.com/morvencao/operator/br_update_versions_map/version/versions.yaml" >>>>>>> update version. +======= + versionsMapURL = "https://raw.githubusercontent.com/istio/operator/master/version/versions.yaml" +>>>>>>> apply comments. ) type manifestVersionsArgs struct { diff --git a/data/translateConfig/translateConfig-1.4.yaml b/data/translateConfig/translateConfig-1.3.yaml similarity index 100% rename from data/translateConfig/translateConfig-1.4.yaml rename to data/translateConfig/translateConfig-1.3.yaml diff --git a/pkg/translate/translate_test.go b/pkg/translate/translate_test.go index c502a8393..bca481030 100644 --- a/pkg/translate/translate_test.go +++ b/pkg/translate/translate_test.go @@ -24,7 +24,7 @@ import ( "istio.io/operator/pkg/version" ) -func TestProtoToValuesV14(t *testing.T) { +func TestProtoToValuesV13(t *testing.T) { tests := []struct { desc string yamlStr string @@ -165,7 +165,7 @@ tracing: }, } - tr, err := NewTranslator(version.NewMinorVersion(1, 4)) + tr, err := NewTranslator(version.NewMinorVersion(1, 3)) if err != nil { t.Fatal(err) } diff --git a/pkg/translate/translate_value.go b/pkg/translate/translate_value.go index db9f38130..1bde4bf30 100644 --- a/pkg/translate/translate_value.go +++ b/pkg/translate/translate_value.go @@ -46,7 +46,7 @@ type ReverseTranslator struct { var ( // ReverseTranslators maps a minor version to a corresponding ReverseTranslator. ReverseTranslators = map[version.MinorVersion]*ReverseTranslator{ - version.NewMinorVersion(1, 4): { + version.NewMinorVersion(1, 3): { APIMapping: map[string]*Translation{}, KubernetesPatternMapping: map[string]string{ "{{.ValueComponentName}}.podAntiAffinityLabelSelector": "{{.FeatureName}}.Components.{{.ComponentName}}.K8s." + diff --git a/pkg/translate/translate_value_test.go b/pkg/translate/translate_value_test.go index 8a48ec307..b1ad2fee5 100644 --- a/pkg/translate/translate_value_test.go +++ b/pkg/translate/translate_value_test.go @@ -372,7 +372,7 @@ autoInjection: `, }, } - tr, err := NewReverseTranslator(version.NewMinorVersion(1, 4)) + tr, err := NewReverseTranslator(version.NewMinorVersion(1, 3)) if err != nil { t.Fatal("fail to get helm value.yaml translator") } diff --git a/version/version.go b/version/version.go index fa4727e23..214ad4928 100644 --- a/version/version.go +++ b/version/version.go @@ -32,6 +32,7 @@ var ( // It must be synced with the versions.yaml file. SupportedVersions = []string{ "1.3.0", + "1.3.1", "1.4.0", } From 034ef25b0a4e56c64e6896a80cfed1211b1a70b7 Mon Sep 17 00:00:00 2001 From: llcao Date: Tue, 8 Oct 2019 21:39:26 -0700 Subject: [PATCH 4/4] fix ut. --- cmd/mesh/manifest-versions.go | 8 - data/translateConfig/translateConfig-1.4.yaml | 212 ++++++++++++++++++ pkg/vfs/assets.gen.go | 23 +- version/version.go | 11 - version/version.yaml | 1 - 5 files changed, 218 insertions(+), 37 deletions(-) create mode 100644 data/translateConfig/translateConfig-1.4.yaml delete mode 100644 version/version.yaml diff --git a/cmd/mesh/manifest-versions.go b/cmd/mesh/manifest-versions.go index 6c7aa1b54..7bb5a2ccf 100644 --- a/cmd/mesh/manifest-versions.go +++ b/cmd/mesh/manifest-versions.go @@ -30,15 +30,7 @@ import ( ) const ( -<<<<<<< HEAD -<<<<<<< HEAD versionsMapURL = "https://raw.githubusercontent.com/istio/operator/master/data/versions.yaml" -======= - versionsMapURL = "https://raw.githubusercontent.com/morvencao/operator/br_update_versions_map/version/versions.yaml" ->>>>>>> update version. -======= - versionsMapURL = "https://raw.githubusercontent.com/istio/operator/master/version/versions.yaml" ->>>>>>> apply comments. ) type manifestVersionsArgs struct { diff --git a/data/translateConfig/translateConfig-1.4.yaml b/data/translateConfig/translateConfig-1.4.yaml new file mode 100644 index 000000000..510b4c13f --- /dev/null +++ b/data/translateConfig/translateConfig-1.4.yaml @@ -0,0 +1,212 @@ +apiMapping: + Hub: + outPath: "global.hub" + Tag: + outPath: "global.tag" + K8SDefaults: + outPath: "global.resources" + DefaultNamespace: + outPath: "global.istioNamespace" + Values.Proxy: + outPath: "global.proxy" + ConfigManagement.Components.Namespace: + outPath: "global.configNamespace" + Policy.Components.Namespace: + outPath: "global.policyNamespace" + Telemetry.Components.Namespace: + outPath: "global.telemetryNamespace" + Security.Components.Namespace: + outPath: "global.securityNamespace" +kubernetesMapping: + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Affinity": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].affinity" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Env": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].env" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.HpaSpec": + outPath: "[HorizontalPodAutoscaler:{{.ResourceName}}].spec" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.ImagePullPolicy": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].imagePullPolicy" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.NodeSelector": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.nodeSelector" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.PodDisruptionBudget": + outPath: "[PodDisruptionBudget:{{.ResourceName}}].spec" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.PodAnnotations": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.metadata.annotations" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.PriorityClassName": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.priorityClassName." + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.ReadinessProbe": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].readinessProbe" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.ReplicaCount": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.replicas" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Resources": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].resources" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Strategy": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.strategy" + "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Tolerations": + outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.tolerations" +toFeature: + crds: Base + Pilot: TrafficManagement + Galley: ConfigManagement + Injector: AutoInjection + Policy: Policy + Telemetry: Telemetry + Citadel: Security + CertManager: Security + NodeAgent: Security + IngressGateway: Gateways + EgressGateway: Gateways + Cni: Cni + Grafana: ThirdParty + Prometheus: ThirdParty + Tracing: ThirdParty + PrometheusOperator: ThirdParty + Kiali: ThirdParty +globalNamespaces: + Pilot: "istioNamespace" + Galley: "configNamespace" + Telemetry: "telemetryNamespace" + Policy: "policyNamespace" + Prometheus: "prometheusNamespace" + Citadel: "securityNamespace" +featureMaps: + Base: + alwaysEnabled: true + Components: + - crds + TrafficManagement: + Components: + - Pilot + Policy: + Components: + - Policy + Telemetry: + Components: + - Telemetry + Security: + Components: + - Citadel + - CertManager + - NodeAgent + ConfigManagement: + Components: + - Galley + AutoInjection: + Components: + - Injector + Gateways: + Components: + - IngressGateway + - EgressGateway + Cni: + Components: + - Cni + ThirdParty: + Components: + - Grafana + - Prometheus + - Tracing + - PrometheusOperator + - Kiali + +componentMaps: + crds: + ToHelmValuesTreeRoot: "global" + HelmSubdir: "crds" + AlwaysEnabled: true + Pilot: + ResourceType: "Deployment" + ResourceName: "istio-pilot" + ContainerName: "discovery" + HelmSubdir: "istio-control/istio-discovery" + ToHelmValuesTreeRoot: "pilot" + Galley: + ResourceType: "Deployment" + ResourceName: "istio-galley" + ContainerName: "galley" + HelmSubdir: "istio-control/istio-config" + ToHelmValuesTreeRoot: "galley" + Injector: + ResourceType: "Deployment" + ResourceName: "istio-sidecar-injector" + ContainerName: "sidecar-injector-webhook" + HelmSubdir: "istio-control/istio-autoinject" + ToHelmValuesTreeRoot: "sidecarInjectorWebhook" + Policy: + ResourceType: "Deployment" + ResourceName: "istio-policy" + ContainerName: "mixer" + HelmSubdir: "istio-policy" + ToHelmValuesTreeRoot: "mixer.policy" + Telemetry: + ResourceType: "Deployment" + ResourceName: "istio-telemetry" + ContainerName: "mixer" + HelmSubdir: "istio-telemetry/mixer-telemetry" + ToHelmValuesTreeRoot: "mixer.telemetry" + Citadel: + ResourceType: "Deployment" + ResourceName: "istio-citadel" + ContainerName: "citadel" + HelmSubdir: "security/citadel" + ToHelmValuesTreeRoot: "security" + NodeAgent: + ResourceType: "DaemonSet" + ResourceName: "istio-nodeagent" + ContainerName: "nodeagent" + HelmSubdir: "security/nodeagent" + ToHelmValuesTreeRoot: "nodeagent" + CertManager: + ResourceType: "Deployment" + ResourceName: "certmanager" + ContainerName: "certmanager" + HelmSubdir: "security/certmanager" + ToHelmValuesTreeRoot: "certmanager" + IngressGateway: + ResourceType: "Deployment" + ResourceName: "istio-ingressgateway" + ContainerName: "istio-proxy" + HelmSubdir: "gateways/istio-ingress" + ToHelmValuesTreeRoot: "gateways.istio-ingressgateway" + EgressGateway: + ResourceType: "Deployment" + ResourceName: "istio-egressgateway" + ContainerName: "istio-proxy" + HelmSubdir: "gateways/istio-egress" + ToHelmValuesTreeRoot: "gateways.istio-egressgateway" + Cni: + ResourceType: "DaemonSet" + ResourceName: "istio-cni-node" + ContainerName: "install-cni" + HelmSubdir: "istio-cni" + ToHelmValuesTreeRoot: "cni" + Tracing: + ResourceType: "Deployment" + ResourceName: "istio-tracing" + ContainerName: "jaeger" + HelmSubdir: "istio-telemetry/tracing" + ToHelmValuesTreeRoot: "tracing.jaeger" + PrometheusOperator: + ResourceType: "Deployment" + ResourceName: "prometheus" + ContainerName: "prometheus" + HelmSubdir: "istio-telemetry/prometheus-operator" + ToHelmValuesTreeRoot: "prometheus" + Kiali: + ResourceType: "Deployment" + ResourceName: "kiali" + ContainerName: "kiali" + HelmSubdir: "istio-telemetry/kiali" + ToHelmValuesTreeRoot: "kiali" + Grafana: + ResourceType: "Deployment" + ResourceName: "grafana" + ContainerName: "grafana" + HelmSubdir: "istio-telemetry/grafana" + ToHelmValuesTreeRoot: "grafana" + Prometheus: + ResourceType: "Deployment" + ResourceName: "prometheus" + ContainerName: "prometheus" + HelmSubdir: "istio-telemetry/prometheus" + ToHelmValuesTreeRoot: "prometheus" diff --git a/pkg/vfs/assets.gen.go b/pkg/vfs/assets.gen.go index b87402487..0298a6858 100644 --- a/pkg/vfs/assets.gen.go +++ b/pkg/vfs/assets.gen.go @@ -215,13 +215,9 @@ // ../../data/profiles/demo.yaml // ../../data/profiles/minimal.yaml // ../../data/profiles/sds.yaml -<<<<<<< HEAD // ../../data/translateConfig/translateConfig-1.3.yaml // ../../data/translateConfig/translateConfig-1.4.yaml // ../../data/versions.yaml -======= -// ../../data/translateConfig/translateConfig-1.4.yaml ->>>>>>> fix test. // DO NOT EDIT! package vfs @@ -32899,7 +32895,7 @@ func profilesSdsYaml() (*asset, error) { return a, nil } -var _translateconfigTranslateconfig14Yaml = []byte(`apiMapping: +var _translateconfigTranslateconfig13Yaml = []byte(`apiMapping: Hub: outPath: "global.hub" Tag: @@ -33113,17 +33109,17 @@ componentMaps: ToHelmValuesTreeRoot: "prometheus" `) -func translateconfigTranslateconfig14YamlBytes() ([]byte, error) { - return _translateconfigTranslateconfig14Yaml, nil +func translateconfigTranslateconfig13YamlBytes() ([]byte, error) { + return _translateconfigTranslateconfig13Yaml, nil } -func translateconfigTranslateconfig14Yaml() (*asset, error) { - bytes, err := translateconfigTranslateconfig14YamlBytes() +func translateconfigTranslateconfig13Yaml() (*asset, error) { + bytes, err := translateconfigTranslateconfig13YamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "translateConfig/translateConfig-1.4.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + info := bindataFileInfo{name: "translateConfig/translateConfig-1.3.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -33656,13 +33652,9 @@ var _bindata = map[string]func() (*asset, error){ "profiles/demo.yaml": profilesDemoYaml, "profiles/minimal.yaml": profilesMinimalYaml, "profiles/sds.yaml": profilesSdsYaml, -<<<<<<< HEAD "translateConfig/translateConfig-1.3.yaml": translateconfigTranslateconfig13Yaml, "translateConfig/translateConfig-1.4.yaml": translateconfigTranslateconfig14Yaml, "versions.yaml": versionsYaml, -======= - "translateConfig/translateConfig-1.4.yaml": translateconfigTranslateconfig14Yaml, ->>>>>>> fix test. } // AssetDir returns the file names below a certain @@ -34015,10 +34007,7 @@ var _bintree = &bintree{nil, map[string]*bintree{ "sds.yaml": &bintree{profilesSdsYaml, map[string]*bintree{}}, }}, "translateConfig": &bintree{nil, map[string]*bintree{ -<<<<<<< HEAD "translateConfig-1.3.yaml": &bintree{translateconfigTranslateconfig13Yaml, map[string]*bintree{}}, -======= ->>>>>>> fix test. "translateConfig-1.4.yaml": &bintree{translateconfigTranslateconfig14Yaml, map[string]*bintree{}}, }}, "versions.yaml": &bintree{versionsYaml, map[string]*bintree{}}, diff --git a/version/version.go b/version/version.go index 214ad4928..61307096b 100644 --- a/version/version.go +++ b/version/version.go @@ -26,17 +26,6 @@ const ( ) var ( -<<<<<<< HEAD -======= - // 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.4.0", - } - ->>>>>>> update version. // OperatorBinaryVersion is the Istio operator version. OperatorBinaryVersion pkgversion.Version // OperatorBinaryGoVersion is the Istio operator version in go-version format. diff --git a/version/version.yaml b/version/version.yaml deleted file mode 100644 index 88c5fb891..000000000 --- a/version/version.yaml +++ /dev/null @@ -1 +0,0 @@ -1.4.0