1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 16:30:02 +00:00

Types vendor update

This commit is contained in:
Alena Prokharchyk
2019-10-29 13:59:02 -07:00
parent 372393ac1b
commit 881f42341a
19 changed files with 1370 additions and 21 deletions

View File

@@ -4,6 +4,7 @@ import (
"github.com/rancher/norman/types"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apiserverconfig "k8s.io/apiserver/pkg/apis/config"
)
type RancherKubernetesEngineConfig struct {
@@ -271,6 +272,8 @@ type KubeAPIService struct {
PodSecurityPolicy bool `yaml:"pod_security_policy" json:"podSecurityPolicy,omitempty"`
// Enable/Disable AlwaysPullImages admissions plugin
AlwaysPullImages bool `yaml:"always_pull_images" json:"alwaysPullImages,omitempty"`
// Secrets encryption provider config
SecretsEncryptionConfig *SecretsEncryptionConfig `yaml:"secrets_encryption_config" json:"secretsEncryptionConfig,omitempty"`
}
type KubeControllerService struct {
@@ -771,3 +774,10 @@ type RKETaint struct {
Effect v1.TaintEffect `json:"effect,omitempty" yaml:"effect"`
TimeAdded *metav1.Time `json:"timeAdded,omitempty" yaml:"timeAdded,omitempty"`
}
type SecretsEncryptionConfig struct {
// Enable/disable secrets encryption provider config
Enabled bool `yaml:"enabled" json:"enabled,omitempty"`
// Custom Encryption Provider configuration object
CustomConfig *apiserverconfig.EncryptionConfiguration `yaml:"custom_config" json:"customConfig,omitempty" norman:"type=map[json]"`
}

View File

@@ -14,10 +14,10 @@ var (
}{
PipelineSystemImages: projectv3.PipelineSystemImages{
Jenkins: m("rancher/pipeline-jenkins-server:v0.1.4"),
JenkinsJnlp: m("jenkins/jnlp-slave:3.10-1-alpine"),
JenkinsJnlp: m("jenkins/jnlp-slave:3.35-4"),
AlpineGit: m("rancher/pipeline-tools:v0.1.14"),
PluginsDocker: m("plugins/docker:17.12"),
Minio: m("minio/minio:RELEASE.2018-05-25T19-49-13Z"),
PluginsDocker: m("plugins/docker:18.09"),
Minio: m("minio/minio:RELEASE.2019-09-25T18-25-51Z"),
Registry: m("registry:2"),
RegistryProxy: m("rancher/pipeline-tools:v0.1.14"),
KubeApply: m("rancher/pipeline-tools:v0.1.14"),

View File

@@ -6,6 +6,7 @@ import (
rbacv1 "k8s.io/api/rbac/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
version "k8s.io/apimachinery/pkg/version"
config "k8s.io/apiserver/pkg/apis/config"
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -4174,6 +4175,11 @@ func (in *KontainerDriverStatus) DeepCopy() *KontainerDriverStatus {
func (in *KubeAPIService) DeepCopyInto(out *KubeAPIService) {
*out = *in
in.BaseService.DeepCopyInto(&out.BaseService)
if in.SecretsEncryptionConfig != nil {
in, out := &in.SecretsEncryptionConfig, &out.SecretsEncryptionConfig
*out = new(SecretsEncryptionConfig)
(*in).DeepCopyInto(*out)
}
return
}
@@ -8425,6 +8431,27 @@ func (in *SearchPrincipalsInput) DeepCopy() *SearchPrincipalsInput {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *SecretsEncryptionConfig) DeepCopyInto(out *SecretsEncryptionConfig) {
*out = *in
if in.CustomConfig != nil {
in, out := &in.CustomConfig, &out.CustomConfig
*out = new(config.EncryptionConfiguration)
(*in).DeepCopyInto(*out)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretsEncryptionConfig.
func (in *SecretsEncryptionConfig) DeepCopy() *SecretsEncryptionConfig {
if in == nil {
return nil
}
out := new(SecretsEncryptionConfig)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ServiceOverride) DeepCopyInto(out *ServiceOverride) {
*out = *in

View File

@@ -35,6 +35,7 @@ type RegistryCredential struct {
Username string `json:"username"`
Password string `json:"password" norman:"writeOnly"`
Auth string `json:"auth" norman:"writeOnly"`
Email string `json:"email"`
}
type Certificate struct {

View File

@@ -14,7 +14,7 @@ func Mirror(image string) string {
image = strings.Replace(image, "quay.io/coreos/", "rancher/coreos-", 1)
image = strings.Replace(image, "quay.io/calico/", "rancher/calico-", 1)
image = strings.Replace(image, "k8s.gcr.io/", "rancher/nginx-ingress-controller-", 1)
image = strings.Replace(image, "plugins/docker", "rancher/jenkins-plugins-docker", 1)
image = strings.Replace(image, "plugins/docker", "rancher/plugins-docker", 1)
image = strings.Replace(image, "kibana", "rancher/kibana", 1)
image = strings.Replace(image, "jenkins/", "rancher/jenkins-", 1)
image = strings.Replace(image, "alpine/git", "rancher/alpine-git", 1)