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

Commit

Permalink
fix ut.
Browse files Browse the repository at this point in the history
  • Loading branch information
llcao authored and morvencao committed Oct 22, 2019
1 parent 817cbce commit 034ef25
Show file tree
Hide file tree
Showing 5 changed files with 218 additions and 37 deletions.
8 changes: 0 additions & 8 deletions cmd/mesh/manifest-versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
212 changes: 212 additions & 0 deletions data/translateConfig/translateConfig-1.4.yaml
Original file line number Diff line number Diff line change
@@ -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"
23 changes: 6 additions & 17 deletions pkg/vfs/assets.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion version/version.yaml

This file was deleted.

0 comments on commit 034ef25

Please sign in to comment.