Skip to content
This repository has been archived by the owner on Jul 3, 2021. It is now read-only.

Commit

Permalink
Remove opsfile of addons-spec and split coredns spec
Browse files Browse the repository at this point in the history
[#165551713]
  • Loading branch information
lubronzhan committed May 17, 2019
1 parent 12e1228 commit c027ae1
Show file tree
Hide file tree
Showing 12 changed files with 548 additions and 554 deletions.
2 changes: 1 addition & 1 deletion bin/run_tests
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ main() {
echo
echo -e "${LIGHT_GREEN} ***** Begin affirmative readme operations tests ***** ${NOCOLOR}"
local ops_files;
ops_files=$(ls ${home}/manifests/ops-files/*.yml ${home}/manifests/ops-files/iaas/{aws,azure,gcp,openstack,vsphere,virtualbox}/*.yml ${home}/manifests/ops-files/addons-spec/*.yml)
ops_files=$(ls ${home}/manifests/ops-files/*.yml ${home}/manifests/ops-files/iaas/{aws,azure,gcp,openstack,vsphere,virtualbox}/*.yml)
ensure_opsfiles_in_readme "$home/manifests/README.md" "$ops_files"

echo
Expand Down
7 changes: 1 addition & 6 deletions bin/test-standard-ops.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ test_standard_ops() {
check_interpolation "add-hostname-to-master-certificate.yml" "-v api-hostname=example.com"
check_interpolation "add-oidc-endpoint.yml" "-l example-vars-files/misc/oidc.yml"
check_interpolation "change-audit-log-flags.yml" "-l example-vars-files/change-audit-log-flags.yml"
check_interpolation "addons-spec.yml" "-v addons-spec={}"
check_interpolation "allow-privileged-containers.yml"
check_interpolation "change-cidrs.yml" "-l example-vars-files/new-cidrs.yml"
check_interpolation "disable-anonymous-auth.yml"
Expand All @@ -69,12 +70,6 @@ test_standard_ops() {
check_interpolation "use-hostgw.yml"
check_interpolation "set-fs-inotify-limit.yml" "-l example-vars-files/fs-inotify-limit.yml"

## Addons
check_interpolation "addons-spec/addons.yml" "-v addons-spec={}"
check_interpolation "addons-spec/coredns.yml" "-v kubedns_service_ip=192.168.20.50"
check_interpolation "addons-spec/kubernetes-dashboard.yml"
check_interpolation "addons-spec/metrics-server.yml"

# Etcd
check_interpolation "change-etcd-metrics-url.yml" "-v etcd_metrics_protocol=http -v etcd_metrics_port=2378"

Expand Down
10 changes: 1 addition & 9 deletions manifests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ For deeper documentation to deploy CFCR go [here](https://github.com/cloudfoundr

| Name | Purpose | Notes |
|:--- |:--- |:--- |
| [`ops-files/addons-spec.yml`](ops-files/addons-spec.yml) | Addons to be deployed into the Kubernetes cluster | - |
| [`ops-files/allow-privileged-containers.yml`](ops-files/allow-privileged-containers.yml) | Allows privileged containers for the Kubernetes cluster. | It is not recommended to use privileged containers however some workloads require it. Container privileges can be limited with the SecurityContextDeny admission plugin (set by default in CFCR). See kubernetes documentation for more information |
| [`ops-files/disable-anonymous-auth.yml`](ops-files/disable-anonymous-auth.yml) | Disable `anonymous-auth` on the API server | - |
| [`ops-files/add-oidc-endpoint.yml`](ops-files/add-oidc-endpoint.yml) | Enable OIDC authentication for the Kubernetes cluster | - |
Expand All @@ -97,15 +98,6 @@ For deeper documentation to deploy CFCR go [here](https://github.com/cloudfoundr
| [`ops-files/use-hostgw.yml`](ops-files/use-hostgw.yml) | Sets the cluster to use host-gw backend in flannel. Necessary for Windows workers. | - |
| [`ops-files/set-fs-inotify-limit.yml`](ops-files/set-fs-inotify-limit.yml) | Configure fs.inotify.max_user_watches.| Extra Vars Required:<br>- **fs_inotify_max_user_watches:** Required for configuring the max inotify user watches. |

### Addons

| Name | Purpose | Notes |
|:--- |:--- |:--- |
| [`ops-files/addons-spec/addons.yml`](ops-files/addons-spec/addons.yml) | Addons to be deployed into the Kubernetes cluster | - |
| [`ops-files/addons-spec/coredns.yml`](ops-files/addons-spec/coredns.yml) | Coredns to be deployed into the Kubernetes cluster | `kubedns_service_ip` variable is needed, for example: `10.100.200.10` |
| [`ops-files/addons-spec/kubernetes-dashboard.yml`](ops-files/addons-spec/kubernetes-dashboard.yml) | Kubernetes dashboard to be deployed into the Kubernetes cluster | - |
| [`ops-files/addons-spec/metrics-server.yml`](ops-files/addons-spec/metrics-server.yml) | Metrics server to be deployed into the Kubernetes cluster | - |

### Etcd

| Name | Purpose | Notes|
Expand Down
Loading

0 comments on commit c027ae1

Please sign in to comment.