Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed fluentd-gcp manifest pod #44721

Merged
merged 1 commit into from
Apr 20, 2017
Merged

Removed fluentd-gcp manifest pod #44721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion build/lib/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@ function kube::release::package_kube_manifests_tarball() {
rm -rf "${release_stage}"

mkdir -p "${release_stage}"
cp "${salt_dir}/fluentd-gcp/fluentd-gcp.yaml" "${release_stage}/"
cp "${salt_dir}/kube-registry-proxy/kube-registry-proxy.yaml" "${release_stage}/"
cp "${salt_dir}/kube-proxy/kube-proxy.manifest" "${release_stage}/"

Expand Down
12 changes: 0 additions & 12 deletions cluster/gce/container-linux/configure-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,17 +1210,6 @@ function start-kube-addons {
cp "${src_dir}/kube-addon-manager.yaml" /etc/kubernetes/manifests
}

# Starts a fluentd static pod for logging for gcp in case master is not registered.
function start-fluentd-static-pod {
echo "Start fluentd pod"
if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]] && \
[[ "${LOGGING_DESTINATION:-}" == "gcp" ]] && \
[[ "${KUBERNETES_MASTER:-}" == "true" ]] && \
[[ "${REGISTER_MASTER_KUBELET:-false}" == "false" ]]; then
cp "${KUBE_HOME}/kube-manifests/kubernetes/fluentd-gcp.yaml" /etc/kubernetes/manifests/
fi
}

# Starts an image-puller - used in test clusters.
function start-image-puller {
echo "Start image-puller"
Expand Down Expand Up @@ -1383,7 +1372,6 @@ if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
start-cluster-autoscaler
start-lb-controller
start-rescheduler
start-fluentd-static-pod
else
start-kube-proxy
# Kube-registry-proxy.
Expand Down
12 changes: 0 additions & 12 deletions cluster/gce/gci/configure-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,17 +1426,6 @@ function start-kube-addons {
cp "${src_dir}/kube-addon-manager.yaml" /etc/kubernetes/manifests
}

# Starts a fluentd static pod for logging for gcp in case master is not registered.
function start-fluentd-static-pod {
echo "Start fluentd pod"
if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]] && \
[[ "${LOGGING_DESTINATION:-}" == "gcp" ]] && \
[[ "${KUBERNETES_MASTER:-}" == "true" ]] && \
[[ "${REGISTER_MASTER_KUBELET:-false}" == "false" ]]; then
cp "${KUBE_HOME}/kube-manifests/kubernetes/fluentd-gcp.yaml" /etc/kubernetes/manifests/
fi
}

# Starts an image-puller - used in test clusters.
function start-image-puller {
echo "Start image-puller"
Expand Down Expand Up @@ -1585,7 +1574,6 @@ if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
start-cluster-autoscaler
start-lb-controller
start-rescheduler
start-fluentd-static-pod
else
start-kube-proxy
# Kube-registry-proxy.
Expand Down
1 change: 0 additions & 1 deletion cluster/saltbase/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ pkg_tar(
pkg_tar(
name = "salt-manifests",
files = [
"salt/fluentd-gcp/fluentd-gcp.yaml",
"salt/kube-proxy/kube-proxy.manifest",
"salt/kube-registry-proxy/kube-registry-proxy.yaml",
],
Expand Down
6 changes: 0 additions & 6 deletions cluster/saltbase/salt/fluentd-gcp/OWNERS
View file
Open in desktop

This file was deleted.