Skip to content

Commit 414b3a7

Browse files
rdrgmnzsrdrgmnzs
committedJul 8, 2018
Rename hept.io authenticator to aws authenticator
·
1.10.0-beta.1
1 parent 617ce04 commit 414b3a7

File tree

13 files changed

+161
-161
lines changed

13 files changed

+161
-161
lines changed
 

‎docs/authentication.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ spec:
3232
rbac: {}
3333
```
3434

35-
## Heptio Authenticator for AWS
35+
## AWS IAM Authenticator
3636

37-
If you want to turn on Heptio Authenticator for AWS, you can add this block
37+
If you want to turn on AWS IAM Authenticator, you can add this block
3838
to your cluster:
3939

4040
```
4141
authentication:
42-
heptio: {}
42+
aws: {}
4343
```
4444

4545
For example:
@@ -51,14 +51,14 @@ metadata:
5151
name: cluster.example.com
5252
spec:
5353
authentication:
54-
heptio: {}
54+
aws: {}
5555
authorization:
5656
rbac: {}
5757
```
5858

59-
Once the cluster is up you will need to create the heptio authenticator
59+
Once the cluster is up you will need to create the AWS IAM authenticator
6060
config as a config map. (This can also be done when boostrapping a cluster using addons)
61-
For more details on heptio authenticator please visit (heptio/authenticator)[https://github.com/heptio/authenticator]
61+
For more details on AWS IAM authenticator please visit (kubernetes-sigs/aws-iam-authenticator)[https://github.com/kubernetes-sigs/aws-iam-authenticator]
6262
Example config:
6363

6464
```
@@ -67,9 +67,9 @@ apiVersion: v1
6767
kind: ConfigMap
6868
metadata:
6969
namespace: kube-system
70-
name: heptio-authenticator-aws
70+
name: aws-iam-authenticator
7171
labels:
72-
k8s-app: heptio-authenticator-aws
72+
k8s-app: aws-iam-authenticator
7373
data:
7474
config.yaml: |
7575
# a unique-per-cluster identifier to prevent replay attacks

‎nodeup/pkg/model/kube_apiserver.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -158,35 +158,35 @@ func (b *KubeAPIServerBuilder) writeAuthenticationConfig(c *fi.ModelBuilderConte
158158
return nil
159159
}
160160

161-
if b.Cluster.Spec.Authentication.Heptio != nil {
162-
id := "heptio-authenticator-aws"
161+
if b.Cluster.Spec.Authentication.Aws != nil {
162+
id := "aws-iam-authenticator"
163163
b.Cluster.Spec.KubeAPIServer.AuthenticationTokenWebhookConfigFile = fi.String(PathAuthnConfig)
164164

165165
{
166166
caCertificate, err := b.NodeupModelContext.KeyStore.FindCert(fi.CertificateId_CA)
167167
if err != nil {
168-
return fmt.Errorf("error fetching Heptio Authentication CA certificate from keystore: %v", err)
168+
return fmt.Errorf("error fetching AWS IAM Authentication CA certificate from keystore: %v", err)
169169
}
170170
if caCertificate == nil {
171-
return fmt.Errorf("Heptio Authentication CA certificate %q not found", fi.CertificateId_CA)
171+
return fmt.Errorf("AWS IAM Authentication CA certificate %q not found", fi.CertificateId_CA)
172172
}
173173

174174
cluster := kubeconfig.KubectlCluster{
175175
Server: "https://127.0.0.1:21362/authenticate",
176176
}
177177
context := kubeconfig.KubectlContext{
178-
Cluster: "heptio-authenticator-aws",
178+
Cluster: "aws-iam-authenticator",
179179
User: "kube-apiserver",
180180
}
181181

182182
cluster.CertificateAuthorityData, err = caCertificate.AsBytes()
183183
if err != nil {
184-
return fmt.Errorf("error encoding Heptio Authentication CA certificate: %v", err)
184+
return fmt.Errorf("error encoding AWS IAM Authentication CA certificate: %v", err)
185185
}
186186

187187
config := kubeconfig.KubectlConfig{}
188188
config.Clusters = append(config.Clusters, &kubeconfig.KubectlClusterWithName{
189-
Name: "heptio-authenticator-aws",
189+
Name: "aws-iam-authenticator",
190190
Cluster: cluster,
191191
})
192192
config.Users = append(config.Users, &kubeconfig.KubectlUserWithName{
@@ -427,7 +427,7 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) {
427427
}
428428

429429
if b.Cluster.Spec.Authentication != nil {
430-
if b.Cluster.Spec.Authentication.Kopeio != nil || b.Cluster.Spec.Authentication.Heptio != nil {
430+
if b.Cluster.Spec.Authentication.Kopeio != nil || b.Cluster.Spec.Authentication.Aws != nil {
431431
addHostPathMapping(pod, container, "authn-config", PathAuthnConfig)
432432
}
433433
}

‎pkg/apis/kops/cluster.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,17 +230,17 @@ type ExecContainerAction struct {
230230

231231
type AuthenticationSpec struct {
232232
Kopeio *KopeioAuthenticationSpec `json:"kopeio,omitempty"`
233-
Heptio *HeptioAuthenticationSpec `json:"heptio,omitempty"`
233+
Aws *AwsAuthenticationSpec `json:"aws,omitempty"`
234234
}
235235

236236
func (s *AuthenticationSpec) IsEmpty() bool {
237-
return s.Kopeio == nil && s.Heptio == nil
237+
return s.Kopeio == nil && s.Aws == nil
238238
}
239239

240240
type KopeioAuthenticationSpec struct {
241241
}
242242

243-
type HeptioAuthenticationSpec struct {
243+
type AwsAuthenticationSpec struct {
244244
}
245245

246246
type AuthorizationSpec struct {

‎pkg/apis/kops/v1alpha1/cluster.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -229,17 +229,17 @@ type ExecContainerAction struct {
229229

230230
type AuthenticationSpec struct {
231231
Kopeio *KopeioAuthenticationSpec `json:"kopeio,omitempty"`
232-
Heptio *HeptioAuthenticationSpec `json:"heptio,omitempty"`
232+
Aws *AwsAuthenticationSpec `json:"aws,omitempty"`
233233
}
234234

235235
func (s *AuthenticationSpec) IsEmpty() bool {
236-
return s.Kopeio == nil && s.Heptio == nil
236+
return s.Kopeio == nil && s.Aws == nil
237237
}
238238

239239
type KopeioAuthenticationSpec struct {
240240
}
241241

242-
type HeptioAuthenticationSpec struct {
242+
type AwsAuthenticationSpec struct {
243243
}
244244

245245
type AuthorizationSpec struct {

‎pkg/apis/kops/v1alpha1/zz_generated.conversion.go

+30-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go

+19-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/kops/v1alpha2/cluster.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,17 +230,17 @@ type ExecContainerAction struct {
230230

231231
type AuthenticationSpec struct {
232232
Kopeio *KopeioAuthenticationSpec `json:"kopeio,omitempty"`
233-
Heptio *HeptioAuthenticationSpec `json:"heptio,omitempty"`
233+
Aws *AwsAuthenticationSpec `json:"aws,omitempty"`
234234
}
235235

236236
func (s *AuthenticationSpec) IsEmpty() bool {
237-
return s.Kopeio == nil && s.Heptio == nil
237+
return s.Kopeio == nil && s.Aws == nil
238238
}
239239

240240
type KopeioAuthenticationSpec struct {
241241
}
242242

243-
type HeptioAuthenticationSpec struct {
243+
type AwsAuthenticationSpec struct {
244244
}
245245

246246
type AuthorizationSpec struct {

‎pkg/apis/kops/v1alpha2/zz_generated.conversion.go

+30-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

+19-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/kops/zz_generated.deepcopy.go

+19-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/model/pki.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -264,15 +264,15 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error {
264264
}
265265

266266
if b.Cluster.Spec.Authentication != nil {
267-
if b.KopsModelContext.Cluster.Spec.Authentication.Heptio != nil {
267+
if b.KopsModelContext.Cluster.Spec.Authentication.Aws != nil {
268268
alternateNames := []string{
269269
"localhost",
270270
"127.0.0.1",
271271
}
272272

273273
t := &fitasks.Keypair{
274-
Name: fi.String("heptio-authenticator-aws"),
275-
Subject: "cn=heptio-authenticator-aws",
274+
Name: fi.String("aws-iam-authenticator"),
275+
Subject: "cn=aws-iam-authenticator",
276276
Type: "server",
277277
AlternateNames: alternateNames,
278278
Signer: defaultCA,

‎upup/models/cloudup/resources/addons/authentication.hept.io/k8s-1.10.yaml ‎upup/models/cloudup/resources/addons/authentication.aws/k8s-1.10.yaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ apiVersion: extensions/v1beta1
33
kind: DaemonSet
44
metadata:
55
namespace: kube-system
6-
name: heptio-authenticator-aws
6+
name: aws-iam-authenticator
77
labels:
8-
k8s-app: heptio-authenticator-aws
8+
k8s-app: aws-iam-authenticator
99
spec:
1010
updateStrategy:
1111
type: RollingUpdate
@@ -14,7 +14,7 @@ spec:
1414
annotations:
1515
scheduler.alpha.kubernetes.io/critical-pod: ""
1616
labels:
17-
k8s-app: heptio-authenticator-aws
17+
k8s-app: aws-iam-authenticator
1818
spec:
1919
# run on the host network (don't depend on CNI)
2020
hostNetwork: true
@@ -28,17 +28,17 @@ spec:
2828
- key: CriticalAddonsOnly
2929
operator: Exists
3030

31-
# run `heptio-authenticator-aws server` with three volumes
32-
# - config (mounted from the ConfigMap at /etc/heptio-authenticator-aws/config.yaml)
31+
# run `aws-iam-authenticator server` with three volumes
32+
# - config (mounted from the ConfigMap at /etc/aws-iam-authenticator/config.yaml)
3333
# - state (persisted TLS certificate and keys, mounted from the host)
3434
# - output (output kubeconfig to plug into your apiserver configuration, mounted from the host)
3535
containers:
36-
- name: heptio-authenticator-aws
36+
- name: aws-iam-authenticator
3737
image: gcr.io/heptio-images/authenticator:v0.3.0
3838
args:
3939
- server
40-
- --config=/etc/heptio-authenticator-aws/config.yaml
41-
- --state-dir=/var/heptio-authenticator-aws
40+
- --config=/etc/aws-iam-authenticator/config.yaml
41+
- --state-dir=/var/aws-iam-authenticator
4242
- --kubeconfig-pregenerated=true
4343

4444
resources:
@@ -51,19 +51,19 @@ spec:
5151

5252
volumeMounts:
5353
- name: config
54-
mountPath: /etc/heptio-authenticator-aws/
54+
mountPath: /etc/aws-iam-authenticator/
5555
- name: state
56-
mountPath: /var/heptio-authenticator-aws/
56+
mountPath: /var/aws-iam-authenticator/
5757
- name: output
58-
mountPath: /etc/kubernetes/heptio-authenticator-aws/
58+
mountPath: /etc/kubernetes/aws-iam-authenticator/
5959

6060
volumes:
6161
- name: config
6262
configMap:
63-
name: heptio-authenticator-aws
63+
name: aws-iam-authenticator
6464
- name: output
6565
hostPath:
66-
path: /srv/kubernetes/heptio-authenticator-aws/
66+
path: /srv/kubernetes/aws-iam-authenticator/
6767
- name: state
6868
hostPath:
69-
path: /srv/kubernetes/heptio-authenticator-aws/
69+
path: /srv/kubernetes/aws-iam-authenticator/

‎upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
759759
manifests[key+"-"+id] = "addons/" + location
760760
}
761761
}
762-
if b.cluster.Spec.Authentication.Heptio != nil {
763-
key := "authentication.hept.io"
762+
if b.cluster.Spec.Authentication.Aws != nil {
763+
key := "authentication.aws"
764764
version := "0.3.0"
765765

766766
{

0 commit comments

Comments
 (0)
Please sign in to comment.