Skip to content

Commit

Permalink
some clean up and delete not used files (#9832)
Browse files Browse the repository at this point in the history
* some clean up and delete not used files

* adding values-istio.yaml back

* space

* not pkg these test files in release archive

* add this

* add files

* more update
  • Loading branch information
linsun authored and istio-testing committed Nov 9, 2018
1 parent 703bc70 commit 86d9121
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 72 deletions.
20 changes: 4 additions & 16 deletions install/kubernetes/helm/istio/values-istio-auth-mcp.yaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,19 @@
# This is used to generate istio.yaml
# This is used to generate istio-auth.yaml with MCP enabled
global:
# controlPlaneMtls enabled. Will result in delays starting the pods while secrets are
# propagated, not recommended for tests.
controlPlaneSecurityEnabled: true

mtls:
# Default setting for service-to-service mtls. Can be set explicitly using
# destination rules or service annotations.
enabled: true

## imagePullSecrets for all ServiceAccount. Must be set for any clustser configured with private docker registry.
# imagePullSecrets:
# - name: "private-registry-key"

# Default is 10s second
refreshInterval: 1s

useMCP: true

istiotesting:
oneNameSpace: false

prometheus:
enabled: true

galley:
enabled: true

security:
enabled: true
5 changes: 0 additions & 5 deletions install/kubernetes/helm/istio/values-istio-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,12 @@ global:
# controlPlaneMtls enabled. Will result in delays starting the pods while secrets are
# propagated, not recommended for tests.
controlPlaneSecurityEnabled: true

mtls:
# Default setting for service-to-service mtls. Can be set explicitly using
# destination rules or service annotations.
enabled: true


## imagePullSecrets for all ServiceAccount. Must be set for any clustser configured with private docker registry.
# imagePullSecrets:
# - name: "private-registry-key"

# Default is 10s second
refreshInterval: 1s

14 changes: 0 additions & 14 deletions install/kubernetes/helm/istio/values-istio-demo-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,9 @@ global:
# destination rules or service annotations.
enabled: true

ingress:
# Ingress is used for migration, for alpha3 we expect ingressgateway
enabled: false

prometheus:
enabled: true

pilot:
traceSampling: 100.0

sidecarInjectorWebhook:
enabled: true
enableNamespacesByDefault: false

grafana:
enabled: true

Expand All @@ -32,8 +21,5 @@ tracing:
servicegraph:
enabled: true

galley:
enabled: true

kiali:
enabled: true
20 changes: 0 additions & 20 deletions install/kubernetes/helm/istio/values-istio-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,9 @@
# It is shipped with the release, used for bookinfo or quick installation of istio.
# Includes components used in the demo, defaults to alpha3 rules.

# If running in minikube you may add:
# --set global.nodePort=true
# --set ingressgateway.service.type=NodePort
global:
nodePort: false

ingress:
# Ingress is used for migration, for alpha3 we expect ingressgateway
enabled: false

prometheus:
enabled: true

pilot:
traceSampling: 100.0

sidecarInjectorWebhook:
enabled: true
enableNamespacesByDefault: false

grafana:
enabled: true

Expand All @@ -31,8 +14,5 @@ tracing:
servicegraph:
enabled: true

galley:
enabled: true

kiali:
enabled: true
9 changes: 1 addition & 8 deletions install/kubernetes/helm/istio/values-istio-mcp.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is used to generate istio.yaml
# This is used to generate istio.yaml with MCP enabled
global:
# controlPlaneMtls enabled. Will result in delays starting the pods while secrets are
# propagated, not recommended for tests.
Expand All @@ -18,11 +18,4 @@ global:

useMCP: true

istiotesting:
oneNameSpace: false

prometheus:
enabled: true

galley:
enabled: true
3 changes: 0 additions & 3 deletions install/kubernetes/helm/istio/values-istio-multicluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ global:
# Default is 10s second
refreshInterval: 1s

prometheus:
enabled: true

# In a multiple cluster environment, citadel uses the same root certificate in all the clusters
security:
selfSigned: false
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ global:
# controlPlaneMtls enabled. Will result in delays starting the pods while secrets are
# propagated, not recommended for tests.
controlPlaneSecurityEnabled: true

mtls:
# Default setting for service-to-service mtls. Can be set explicitly using
# destination rules or service annotations.
enabled: true

## imagePullSecrets for all ServiceAccount. Must be set for any clustser configured with private docker registry.
# imagePullSecrets:
# - name: "private-registry-key"

# Default is 10s second
refreshInterval: 1s

istiotesting:
oneNameSpace: true

6 changes: 3 additions & 3 deletions install/kubernetes/helm/istio/values-istio-one-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ global:
# controlPlaneMtls enabled. Will result in delays starting the pods while secrets are
# propagated, not recommended for tests.
controlPlaneSecurityEnabled: false

mtls:
# Default setting for service-to-service mtls. Can be set explicitly using
# destination rules or service annotations.
enabled: false

## imagePullSecrets for all ServiceAccount. Must be set for any clustser configured with private docker registry.
# imagePullSecrets:
# - name: "private-registry-key"

# Default is 10s second
refreshInterval: 1s

istiotesting:
oneNameSpace: true

1 change: 1 addition & 0 deletions install/kubernetes/helm/istio/values-istio.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# This is used to generate istio.yaml for automated CI/CD test, using v1/alpha1
# or v2/alpha3 with 'gradual migration' (using env variable at inject time).
global:
Expand Down
11 changes: 11 additions & 0 deletions release/create_release_archives.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,17 @@ done

ls -l "${COMMON_FILES_DIR}/install/kubernetes/"


for unwanted_values_yaml in \
values-istio.yaml \
values-istio-one-namespace.yaml \
values-istio-one-namespace-auth.yaml \
values-istio-auth.yaml; do
rm -f "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/${unwanted_values_yaml}"
done

ls -l "${COMMON_FILES_DIR}/install/kubernetes/helm/istio"

# Changing dir such that tar and zip files are
# created with right hiereachy
pushd "${COMMON_FILES_DIR}/.."
Expand Down

0 comments on commit 86d9121

Please sign in to comment.