mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
rbd: create token and use it for vault SA
create the token if kubernetes version in
1.24+ and use it for vault sa.
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit 7a2dd4c3cf
)
This commit is contained in:
parent
77f5435c4c
commit
d7c7f29d77
@ -31,4 +31,7 @@ rules:
|
|||||||
- apiGroups: ["storage.k8s.io"]
|
- apiGroups: ["storage.k8s.io"]
|
||||||
resources: ["volumeattachments"]
|
resources: ["volumeattachments"]
|
||||||
verbs: ["list", "get"]
|
verbs: ["list", "get"]
|
||||||
|
- apiGroups: [""]
|
||||||
|
resources: ["serviceaccounts/token"]
|
||||||
|
verbs: ["create"]
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
@ -70,5 +70,8 @@ rules:
|
|||||||
resources: ["csinodes"]
|
resources: ["csinodes"]
|
||||||
verbs: ["get", "list", "watch"]
|
verbs: ["get", "list", "watch"]
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
- apiGroups: [""]
|
||||||
|
resources: ["serviceaccounts/token"]
|
||||||
|
verbs: ["create"]
|
||||||
|
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
@ -30,6 +30,9 @@ rules:
|
|||||||
- apiGroups: ["storage.k8s.io"]
|
- apiGroups: ["storage.k8s.io"]
|
||||||
resources: ["volumeattachments"]
|
resources: ["volumeattachments"]
|
||||||
verbs: ["list", "get"]
|
verbs: ["list", "get"]
|
||||||
|
- apiGroups: [""]
|
||||||
|
resources: ["serviceaccounts/token"]
|
||||||
|
verbs: ["create"]
|
||||||
---
|
---
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
@ -63,6 +63,9 @@ rules:
|
|||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["serviceaccounts"]
|
resources: ["serviceaccounts"]
|
||||||
verbs: ["get"]
|
verbs: ["get"]
|
||||||
|
- apiGroups: [""]
|
||||||
|
resources: ["serviceaccounts/token"]
|
||||||
|
verbs: ["create"]
|
||||||
---
|
---
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
@ -23,9 +23,13 @@ import (
|
|||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"github.com/ceph/ceph-csi/internal/util/k8s"
|
||||||
|
|
||||||
"github.com/libopenstorage/secrets/vault"
|
"github.com/libopenstorage/secrets/vault"
|
||||||
|
authenticationv1 "k8s.io/api/authentication/v1"
|
||||||
corev1 "k8s.io/api/core/v1"
|
corev1 "k8s.io/api/core/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
"k8s.io/client-go/kubernetes"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -35,6 +39,9 @@ const (
|
|||||||
// should be available in the Tenants namespace. This ServiceAccount
|
// should be available in the Tenants namespace. This ServiceAccount
|
||||||
// will be used to connect to Hashicorp Vault.
|
// will be used to connect to Hashicorp Vault.
|
||||||
vaultTenantSAName = "ceph-csi-vault-sa"
|
vaultTenantSAName = "ceph-csi-vault-sa"
|
||||||
|
// Kubernetes version which requires ServiceAccount token creation.
|
||||||
|
// Kubernetes 1.24 => 1 * 1000 + 24.
|
||||||
|
kubeMinVersionForCreateToken = 1024
|
||||||
)
|
)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -292,9 +299,9 @@ func (kms *vaultTenantSA) getToken() (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, secretRef := range sa.Secrets {
|
for _, secretRef := range sa.Secrets {
|
||||||
secret, err := c.CoreV1().Secrets(kms.Tenant).Get(context.TODO(), secretRef.Name, metav1.GetOptions{})
|
secret, sErr := c.CoreV1().Secrets(kms.Tenant).Get(context.TODO(), secretRef.Name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if sErr != nil {
|
||||||
return "", fmt.Errorf("failed to get Secret %s/%s: %w", kms.Tenant, secretRef.Name, err)
|
return "", fmt.Errorf("failed to get Secret %s/%s: %w", kms.Tenant, secretRef.Name, sErr)
|
||||||
}
|
}
|
||||||
|
|
||||||
token, ok := secret.Data["token"]
|
token, ok := secret.Data["token"]
|
||||||
@ -303,7 +310,7 @@ func (kms *vaultTenantSA) getToken() (string, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return "", fmt.Errorf("failed to find token in ServiceAccount %s/%s", kms.Tenant, kms.tenantSAName)
|
return kms.createToken(sa, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
// getTokenPath creates a temporary directory structure that contains the token
|
// getTokenPath creates a temporary directory structure that contains the token
|
||||||
@ -327,3 +334,33 @@ func (kms *vaultTenantSA) getTokenPath() (string, error) {
|
|||||||
|
|
||||||
return dir + "/token", nil
|
return dir + "/token", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// createToken creates required service account token for kubernetes 1.24+,
|
||||||
|
// else returns error.
|
||||||
|
// From kubernetes v1.24+, secret for service account tokens are not
|
||||||
|
// automatically created. Hence, use the create token api to fetch it.
|
||||||
|
// refer: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md \
|
||||||
|
// #no-really-you-must-read-this-before-you-upgrade-1 .
|
||||||
|
func (kms *vaultTenantSA) createToken(sa *corev1.ServiceAccount, client *kubernetes.Clientset) (string, error) {
|
||||||
|
major, minor, err := k8s.GetServerVersion(client)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to get server version: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (major*1000 + minor) >= kubeMinVersionForCreateToken {
|
||||||
|
tokenRequest := &authenticationv1.TokenRequest{}
|
||||||
|
token, err := client.CoreV1().ServiceAccounts(kms.Tenant).CreateToken(
|
||||||
|
context.TODO(),
|
||||||
|
sa.Name,
|
||||||
|
tokenRequest,
|
||||||
|
metav1.CreateOptions{},
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to create token for service account %s/%s: %w", kms.Tenant, sa.Name, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return token.Status.Token, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", fmt.Errorf("failed to find token in ServiceAccount %s/%s", kms.Tenant, kms.tenantSAName)
|
||||||
|
}
|
||||||
|
45
internal/util/k8s/version.go
Normal file
45
internal/util/k8s/version.go
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2022 The Ceph-CSI Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package k8s
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"k8s.io/client-go/kubernetes"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetServerVersion returns kubernetes server major and minor version as
|
||||||
|
// integer.
|
||||||
|
func GetServerVersion(client *kubernetes.Clientset) (int, int, error) {
|
||||||
|
version, err := client.ServerVersion()
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, fmt.Errorf("failed to get ServerVersion: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
major, err := strconv.Atoi(version.Major)
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, fmt.Errorf("failed to convert Kubernetes major version %q to int: %w", version.Major, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
minor, err := strconv.Atoi(version.Minor)
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, fmt.Errorf("failed to convert Kubernetes minor version %q to int: %w", version.Minor, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return major, minor, nil
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user