bump helm chart version

api/v1alpha1/connection_types.go

@@ -20,10 +20,10 @@ type StaticCredentialsAuth struct {
 }
 
 type Oauth2TokenExchange struct {
-	TokenEndpoint string            `json:"tokenEndpoint"`
-	PrivateKey    *CredentialSource `json:"privateKey"`
-	JWTHeader     *JWTHeader        `json:",inline"`
-	JWTClaims     *JWTClaims        `json:",inline"`
+	Endpoint   string            `json:"endpoint"`
+	PrivateKey *CredentialSource `json:"privateKey"`
+	JWTHeader  *JWTHeader        `json:",inline"`
+	JWTClaims  *JWTClaims        `json:",inline"`
 }
 
 type JWTHeader struct {

deploy/ydb-operator/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.14
+version: 0.5.15
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.14"
+appVersion: "0.5.15"

deploy/ydb-operator/crds/storage.yaml

@@ -4862,6 +4862,8 @@ spec:
                     properties:
                       audience:
                         type: string
+                      endpoint:
+                        type: string
                       id:
                         type: string
                       issuer:
@@ -4896,11 +4898,9 @@ spec:
                         type: string
                       subject:
                         type: string
-                      tokenEndpoint:
-                        type: string
                     required:
+                    - endpoint
                     - privateKey
-                    - tokenEndpoint
                     type: object
                   staticCredentials:
                     properties:

internal/resources/resource.go

@@ -412,8 +412,7 @@ func getYDBStaticCredentials(
 				err)
 		}
 	}
-
-	storageEndpoint := storage.GetStorageEndpoint()
+	endpoint := storage.GetStorageEndpoint()
 
 	var caBundle []byte
 	if storage.IsStorageEndpointSecure() {
@@ -431,7 +430,7 @@ func getYDBStaticCredentials(
 	return ydbCredentials.NewStaticCredentials(
 		username,
 		password,
-		storageEndpoint,
+		endpoint,
 		ydbCredentials.WithGrpcDialOptions(dialOptions),
 	), nil
 }
@@ -458,17 +457,18 @@ func getYDBOauth2Credentials(
 	privateKeyPEM, err := jwt.ParseRSAPrivateKeyFromPEM([]byte(privateKey))
 	if err != nil {
 		return nil, fmt.Errorf(
-			"failed to get parse RSA private key from secret: %s, key: %s, error: %w",
+			"failed to parse RSA private key for Oauth2TokenExchange from secret: %s, key: %s, error: %w",
 			auth.Oauth2TokenExhange.PrivateKey.SecretKeyRef.Name,
 			auth.Oauth2TokenExhange.PrivateKey.SecretKeyRef.Key,
-			err)
+			err,
+		)
 	}
 
 	var signMethod jwt.SigningMethod
 	if auth.Oauth2TokenExhange.JWTHeader.SignAlg != "" {
 		if !isSignAlgorithmSupported(auth.Oauth2TokenExhange.JWTHeader.SignAlg) {
 			return nil, fmt.Errorf(
-				"sign algorithm %s does not supported by jwt library",
+				"sign algorithm %s does not supported",
 				auth.Oauth2TokenExhange.JWTHeader.SignAlg,
 			)
 		}
@@ -478,7 +478,7 @@ func getYDBOauth2Credentials(
 	}
 
 	return ydbCredentials.NewOauth2TokenExchangeCredentials(
-		ydbCredentials.WithTokenEndpoint(auth.Oauth2TokenExhange.TokenEndpoint),
+		ydbCredentials.WithTokenEndpoint(auth.Oauth2TokenExhange.Endpoint),
 		ydbCredentials.WithAudience(auth.Oauth2TokenExhange.JWTClaims.Audience),
 		ydbCredentials.WithJWTSubjectToken(
 			ydbCredentials.WithSigningMethod(signMethod),