diff --git a/clr-k8s-examples/1-core-metrics/aggregated-metrics-reader.yaml b/clr-k8s-examples/1-core-metrics/aggregated-metrics-reader.yaml deleted file mode 100644 index cdf3415..0000000 --- a/clr-k8s-examples/1-core-metrics/aggregated-metrics-reader.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: system:aggregated-metrics-reader - labels: - rbac.authorization.k8s.io/aggregate-to-view: "true" - rbac.authorization.k8s.io/aggregate-to-edit: "true" - rbac.authorization.k8s.io/aggregate-to-admin: "true" -rules: -- apiGroups: ["metrics.k8s.io"] - resources: ["pods"] - verbs: ["get", "list", "watch"] diff --git a/clr-k8s-examples/1-core-metrics/auth-delegator.yaml b/clr-k8s-examples/1-core-metrics/auth-delegator.yaml index e3442c5..04826ae 100644 --- a/clr-k8s-examples/1-core-metrics/auth-delegator.yaml +++ b/clr-k8s-examples/1-core-metrics/auth-delegator.yaml @@ -1,4 +1,3 @@ ---- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: diff --git a/clr-k8s-examples/1-core-metrics/auth-reader.yaml b/clr-k8s-examples/1-core-metrics/auth-reader.yaml index f0616e1..1ab6a6a 100644 --- a/clr-k8s-examples/1-core-metrics/auth-reader.yaml +++ b/clr-k8s-examples/1-core-metrics/auth-reader.yaml @@ -1,4 +1,3 @@ ---- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding metadata: diff --git a/clr-k8s-examples/1-core-metrics/metrics-apiservice.yaml b/clr-k8s-examples/1-core-metrics/metrics-apiservice.yaml index 08b0530..a8860fb 100644 --- a/clr-k8s-examples/1-core-metrics/metrics-apiservice.yaml +++ b/clr-k8s-examples/1-core-metrics/metrics-apiservice.yaml @@ -1,4 +1,3 @@ ---- apiVersion: apiregistration.k8s.io/v1beta1 kind: APIService metadata: diff --git a/clr-k8s-examples/1-core-metrics/metrics-server-deployment.yaml b/clr-k8s-examples/1-core-metrics/metrics-server-deployment.yaml index af70451..354dc17 100644 --- a/clr-k8s-examples/1-core-metrics/metrics-server-deployment.yaml +++ b/clr-k8s-examples/1-core-metrics/metrics-server-deployment.yaml @@ -1,4 +1,3 @@ ---- apiVersion: v1 kind: ServiceAccount metadata: @@ -23,19 +22,10 @@ spec: k8s-app: metrics-server spec: serviceAccountName: metrics-server - volumes: - # mount in tmp so we can safely use from-scratch images and/or read-only containers - - name: tmp-dir - emptyDir: {} containers: - name: metrics-server - image: k8s.gcr.io/metrics-server-amd64:v0.3.1 + image: gcr.io/google_containers/metrics-server-amd64:v0.2.0 imagePullPolicy: Always - args: - - --kubelet-insecure-tls - - --kubelet-preferred-address-types=InternalIP - - --logtostderr - volumeMounts: - - name: tmp-dir - mountPath: /tmp - + command: + - /metrics-server + - --source=kubernetes.summary_api:https://kubernetes.default.svc?kubeletHttps=true&kubeletPort=10250&useServiceAccount=true&insecure=true diff --git a/clr-k8s-examples/1-core-metrics/metrics-server-service.yaml b/clr-k8s-examples/1-core-metrics/metrics-server-service.yaml index 082b00c..974628e 100644 --- a/clr-k8s-examples/1-core-metrics/metrics-server-service.yaml +++ b/clr-k8s-examples/1-core-metrics/metrics-server-service.yaml @@ -1,4 +1,3 @@ ---- apiVersion: v1 kind: Service metadata: diff --git a/clr-k8s-examples/1-core-metrics/resource-reader.yaml b/clr-k8s-examples/1-core-metrics/resource-reader.yaml index 34294a3..4173841 100644 --- a/clr-k8s-examples/1-core-metrics/resource-reader.yaml +++ b/clr-k8s-examples/1-core-metrics/resource-reader.yaml @@ -1,4 +1,3 @@ ---- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/clr-k8s-examples/1-core-metrics/versions b/clr-k8s-examples/1-core-metrics/versions index f96508a..6a76d7a 100644 --- a/clr-k8s-examples/1-core-metrics/versions +++ b/clr-k8s-examples/1-core-metrics/versions @@ -1 +1 @@ -https://github.com/kubernetes-incubator/metrics-server/tree/v0.3.1/deploy/1.8%2B +f90c6705d2381ea2db1a6343da6c400bd2ef4cb2