Merge pull request #1461 from cmurphy/eks-operator-1.1.2-rc1

[2.6.2] Bump eks-operator to 1.1.2-rc1
pull/1555/head
Colleen Murphy 2021-10-14 10:56:24 -07:00 committed by GitHub
commit a32d91d90b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 395 additions and 4 deletions

View File

@ -0,0 +1,11 @@
annotations:
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"
catalog.cattle.io/namespace: cattle-system
catalog.cattle.io/os: linux
catalog.cattle.io/release-name: rancher-eks-operator-crd
apiVersion: v2
appVersion: 1.1.2-rc1
description: EKS Operator CustomResourceDefinitions
name: rancher-eks-operator-crd
version: 100.0.1+up1.1.2-rc1

View File

@ -0,0 +1,217 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
helm.sh/resource-policy: keep
name: eksclusterconfigs.eks.cattle.io
spec:
group: eks.cattle.io
names:
kind: EKSClusterConfig
plural: eksclusterconfigs
shortNames:
- ekscc
singular: eksclusterconfig
preserveUnknownFields: false
scope: Namespaced
versions:
- name: v1
schema:
openAPIV3Schema:
properties:
spec:
properties:
amazonCredentialSecret:
nullable: true
type: string
displayName:
nullable: true
type: string
imported:
type: boolean
kmsKey:
nullable: true
type: string
kubernetesVersion:
nullable: true
type: string
loggingTypes:
items:
nullable: true
type: string
nullable: true
type: array
nodeGroups:
items:
properties:
desiredSize:
nullable: true
type: integer
diskSize:
nullable: true
type: integer
ec2SshKey:
nullable: true
type: string
gpu:
nullable: true
type: boolean
imageId:
nullable: true
type: string
instanceType:
nullable: true
type: string
labels:
additionalProperties:
nullable: true
type: string
nullable: true
type: object
launchTemplate:
nullable: true
properties:
id:
nullable: true
type: string
name:
nullable: true
type: string
version:
nullable: true
type: integer
type: object
maxSize:
nullable: true
type: integer
minSize:
nullable: true
type: integer
nodegroupName:
nullable: true
type: string
requestSpotInstances:
nullable: true
type: boolean
resourceTags:
additionalProperties:
nullable: true
type: string
nullable: true
type: object
spotInstanceTypes:
items:
nullable: true
type: string
nullable: true
type: array
subnets:
items:
nullable: true
type: string
nullable: true
type: array
tags:
additionalProperties:
nullable: true
type: string
nullable: true
type: object
userData:
nullable: true
type: string
version:
nullable: true
type: string
required:
- nodegroupName
type: object
nullable: true
type: array
privateAccess:
nullable: true
type: boolean
publicAccess:
nullable: true
type: boolean
publicAccessSources:
items:
nullable: true
type: string
nullable: true
type: array
region:
nullable: true
type: string
secretsEncryption:
nullable: true
type: boolean
securityGroups:
items:
nullable: true
type: string
nullable: true
type: array
serviceRole:
nullable: true
type: string
subnets:
items:
nullable: true
type: string
nullable: true
type: array
tags:
additionalProperties:
nullable: true
type: string
nullable: true
type: object
type: object
status:
properties:
failureMessage:
nullable: true
type: string
managedLaunchTemplateID:
nullable: true
type: string
managedLaunchTemplateVersions:
additionalProperties:
nullable: true
type: string
nullable: true
type: object
networkFieldsSource:
nullable: true
type: string
phase:
nullable: true
type: string
securityGroups:
items:
nullable: true
type: string
nullable: true
type: array
subnets:
items:
nullable: true
type: string
nullable: true
type: array
templateVersionsToDelete:
items:
nullable: true
type: string
nullable: true
type: array
virtualNetwork:
nullable: true
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}

View File

@ -0,0 +1,18 @@
annotations:
catalog.cattle.io/auto-install: rancher-eks-operator-crd=match
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"
catalog.cattle.io/namespace: cattle-system
catalog.cattle.io/os: linux
catalog.cattle.io/provides-gvr: eksclusterconfigs.eks.cattle.io/v1
catalog.cattle.io/rancher-version: '>= 2.6.0-alpha'
catalog.cattle.io/release-name: rancher-eks-operator
catalog.cattle.io/scope: management
apiVersion: v2
appVersion: 1.1.2-rc1
description: A Helm chart for provisioning EKS clusters
home: https://github.com/rancher/eks-operator
name: rancher-eks-operator
sources:
- https://github.com/rancher/eks-operator
version: 100.0.1+up1.1.2-rc1

View File

@ -0,0 +1,4 @@
You have deployed the Rancher EKS operator
Version: {{ .Chart.AppVersion }}
Description: This operator provisions EKS clusters
from EKSClusterConfig CRs.

View File

@ -0,0 +1,9 @@
{{/* vim: set filetype=mustache: */}}
{{- define "system_default_registry" -}}
{{- if .Values.global.systemDefaultRegistry -}}
{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
{{- else -}}
{{- "" -}}
{{- end -}}
{{- end -}}

View File

@ -0,0 +1,15 @@
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: eks-operator
namespace: cattle-system
rules:
- apiGroups: ['']
resources: ['secrets']
verbs: ['get', 'list', 'create', 'watch']
- apiGroups: ['eks.cattle.io']
resources: ['eksclusterconfigs']
verbs: ['get', 'list', 'update', 'watch']
- apiGroups: ['eks.cattle.io']
resources: ['eksclusterconfigs/status']
verbs: ['update']

View File

@ -0,0 +1,13 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: eks-operator
namespace: cattle-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: eks-operator
subjects:
- kind: ServiceAccount
name: eks-operator
namespace: cattle-system

View File

@ -0,0 +1,50 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: eks-config-operator
namespace: cattle-system
spec:
replicas: 1
selector:
matchLabels:
ke.cattle.io/operator: eks
template:
metadata:
labels:
ke.cattle.io/operator: eks
spec:
serviceAccountName: eks-operator
securityContext:
fsGroup: 1007
runAsUser: 1007
containers:
- name: eks-operator
image: {{ template "system_default_registry" . }}{{ .Values.eksOperator.image.repository }}:{{ .Values.eksOperator.image.tag }}
imagePullPolicy: IfNotPresent
env:
- name: HTTP_PROXY
value: {{ .Values.httpProxy }}
- name: HTTPS_PROXY
value: {{ .Values.httpsProxy }}
- name: NO_PROXY
value: {{ .Values.noProxy }}
{{- if .Values.additionalTrustedCAs }}
# eks-operator mounts the additional CAs in two places:
volumeMounts:
# This directory is owned by the eks-operator user so c_rehash works here.
- mountPath: /etc/rancher/ssl/ca-additional.pem
name: tls-ca-additional-volume
subPath: ca-additional.pem
readOnly: true
# This directory is root-owned so c_rehash doesn't work here,
# but the cert is here in case update-ca-certificates is called in the future or by the OS.
- mountPath: /etc/pki/trust/anchors/ca-additional.pem
name: tls-ca-additional-volume
subPath: ca-additional.pem
readOnly: true
volumes:
- name: tls-ca-additional-volume
secret:
defaultMode: 0400
secretName: tls-ca-additional
{{- end }}

View File

@ -0,0 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
namespace: cattle-system
name: eks-operator

View File

@ -0,0 +1,12 @@
global:
systemDefaultRegistry: ""
eksOperator:
image:
repository: rancher/eks-operator
tag: v1.1.2-rc1
httpProxy: ""
httpsProxy: ""
noProxy: ""
additionalTrustedCAs: false

View File

@ -1488,6 +1488,28 @@ entries:
- assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-1.0.100.tgz
version: 1.0.100
rancher-eks-operator:
- annotations:
catalog.cattle.io/auto-install: rancher-eks-operator-crd=match
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"
catalog.cattle.io/namespace: cattle-system
catalog.cattle.io/os: linux
catalog.cattle.io/provides-gvr: eksclusterconfigs.eks.cattle.io/v1
catalog.cattle.io/rancher-version: '>= 2.6.0-alpha'
catalog.cattle.io/release-name: rancher-eks-operator
catalog.cattle.io/scope: management
apiVersion: v2
appVersion: 1.1.2-rc1
created: "2021-09-02T16:02:02.572669004-07:00"
description: A Helm chart for provisioning EKS clusters
digest: 161c5d838d22c003e87b91080aef4573c7c4a6576d602147ce2dfbae6b6bbddb
home: https://github.com/rancher/eks-operator
name: rancher-eks-operator
sources:
- https://github.com/rancher/eks-operator
urls:
- assets/rancher-eks-operator/rancher-eks-operator-100.0.1+up1.1.2-rc1.tgz
version: 100.0.1+up1.1.2-rc1
- annotations:
catalog.cattle.io/auto-install: rancher-eks-operator-crd=match
catalog.cattle.io/certified: rancher
@ -1511,6 +1533,21 @@ entries:
- assets/rancher-eks-operator/rancher-eks-operator-100.0.0+up1.1.1.tgz
version: 100.0.0+up1.1.1
rancher-eks-operator-crd:
- annotations:
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"
catalog.cattle.io/namespace: cattle-system
catalog.cattle.io/os: linux
catalog.cattle.io/release-name: rancher-eks-operator-crd
apiVersion: v2
appVersion: 1.1.2-rc1
created: "2021-09-02T16:01:40.447176918-07:00"
description: EKS Operator CustomResourceDefinitions
digest: 02b48f187f9371758951c48fa096a5379064fbb89e64e194e0e01ed2a18b52fb
name: rancher-eks-operator-crd
urls:
- assets/rancher-eks-operator-crd/rancher-eks-operator-crd-100.0.1+up1.1.2-rc1.tgz
version: 100.0.1+up1.1.2-rc1
- annotations:
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"

View File

@ -1,2 +1,2 @@
url: https://github.com/rancher/eks-operator/releases/download/v1.1.1/rancher-eks-operator-crd-1.1.1.tgz
version: 100.0.0
url: https://github.com/rancher/eks-operator/releases/download/v1.1.2-rc1/rancher-eks-operator-crd-1.1.2-rc1.tgz
version: 100.0.1

View File

@ -1,2 +1,2 @@
url: https://github.com/rancher/eks-operator/releases/download/v1.1.1/rancher-eks-operator-1.1.1.tgz
version: 100.0.0
url: https://github.com/rancher/eks-operator/releases/download/v1.1.2-rc1/rancher-eks-operator-1.1.2-rc1.tgz
version: 100.0.1