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.

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

Fix host metadata on GKE #3907

Merged
merged 1 commit into from
Aug 22, 2019
Merged

Fix host metadata on GKE #3907

merged 1 commit into from
Aug 22, 2019

Conversation

CharlyF
Copy link
Contributor

@CharlyF CharlyF commented Jul 19, 2019

What does this PR do?

The agent's status output contains the metadata exposed by the GCE metadata endpoint.
This contains the startup script for containerd as well as the kubeconfig.

This makes the status output very large with irrelevant data.

  Hostnames
  =========
    host_aliases: [gke-x-hcw0 gke-x-default-pool]
[...]
      google-compute-enable-pcid:true
      kube-labels:beta.kubernetes.io/fluentd-ds-ready=true,cloud.google.com/gke-nodepool=default-pool,cloud.google.com/gke-os-distribution=cos,runtime=containerd
      cluster-location:europe-west1
      containerd-configure-sh:#!/bin/bash

# This is a copy of https://raw.githubusercontent.com/containerd/cri/release/1.11/cluster/gce/configure.sh

set -o xtrace
set -o errexit
set -o nounset
set -o pipefail

# CONTAINERD_HOME is the directory for containerd.
CONTAINERD_HOME="/home/containerd"
[...]
mount --bind -o ro "${CONTAINERD_HOME}" "${CONTAINERD_HOME}"
      cluster-uid:xxx
      kubelet-config:apiVersion: kubelet.config.k8s.io/v1beta1
authentication:
  anonymous:
    enabled: false
  webhook:
[...]

@CharlyF CharlyF requested a review from a team as a code owner July 19, 2019 17:16
@CharlyF CharlyF added this to the 6.14.0 milestone Jul 19, 2019
@albertvaka
Copy link
Contributor

Is this good to be merged @CharlyF ?

@CharlyF CharlyF merged commit e1e2f24 into master Aug 22, 2019
@CharlyF CharlyF deleted the charlyf/fix_status branch August 22, 2019 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants