From 3622f2d0ecdc5b48bfe4f76c8d10ae006fc06f91 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Tue, 12 Mar 2019 14:10:49 -0700 Subject: [PATCH] Add kube-api-auth image to k8s_defaults Needed for generated list of images for air-gap. For rancher/rancher/issues/18755 --- apis/management.cattle.io/v3/authn_types.go | 4 ++++ apis/management.cattle.io/v3/k8s_defaults.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/apis/management.cattle.io/v3/authn_types.go b/apis/management.cattle.io/v3/authn_types.go index 117c1f34..5cb0badc 100644 --- a/apis/management.cattle.io/v3/authn_types.go +++ b/apis/management.cattle.io/v3/authn_types.go @@ -315,3 +315,7 @@ type KeyCloakConfig struct { type OKTAConfig struct { SamlConfig `json:",inline" mapstructure:",squash"` } + +type AuthSystemImages struct { + KubeAPIAuth string `json:"kubeAPIAuth,omitempty"` +} diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index e957446b..b9f5938b 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -92,6 +92,7 @@ var ( AlertSystemImages AlertSystemImages PipelineSystemImages projectv3.PipelineSystemImages LoggingSystemImages LoggingSystemImages + AuthSystemImages AuthSystemImages }{ AlertSystemImages: AlertSystemImages{ AlertManager: m("prom/alertmanager:v0.15.2"), @@ -112,6 +113,9 @@ var ( FluentdHelper: m("rancher/fluentd-helper:v0.1.2"), LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.4"), }, + AuthSystemImages: AuthSystemImages{ + KubeAPIAuth: m("rancher/kube-api-auth:v0.1.3"), + }, } AllK8sVersions = map[string]RKESystemImages{