Merge branch 'master' into worker/1.153.0

Author: chukka

.gitignore

@@ -23,6 +23,7 @@ examples/terraform/jfrog-platform-aws-install/artifactory-license.yaml
 examples/terraform/jfrog-platform-aws-install/jfrog-custom.yaml
 examples/terraform/jfrog-platform-aws-install/terraform.tfstate
 examples/terraform/jfrog-platform-aws-install/terraform.tfstate.backup
+examples/terraform/jfrog-platform-aws-install/terraform.tfvars
 
 #
 tmp

examples/terraform/jfrog-platform-aws-install/eks.tf

@@ -16,6 +16,7 @@ resource "aws_security_group_rule" "allow_management_from_my_ip" {
 
 module "eks" {
     source  = "terraform-aws-modules/eks/aws"
+    version = "~> 20.0"
 
     cluster_name    = local.cluster_name
     cluster_version = var.kubernetes_version
@@ -230,6 +231,7 @@ resource "kubernetes_storage_class" "gp3_storage_class" {
 
 module "ebs_csi_irsa_role" {
     source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+    version = "~> 5.0"
 
     role_name             = "ebs-csi-${module.eks.cluster_name}-${var.region}"
     attach_ebs_csi_policy = true

examples/terraform/jfrog-platform-aws-install/metrics.tf

@@ -1,13 +1,4 @@
-# Configure the Helm provider to use the EKS cluster
-provider "helm" {
-  kubernetes {
-    host                   = module.eks.cluster_endpoint
-    token                  = data.aws_eks_cluster_auth.jfrog_cluster.token
-    cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
-  }
-}
-
-# Install the metrics server
+# Install the metrics server if the deploy_metrics_server variable is true
 resource "helm_release" "metrics_server" {
   count = var.deploy_metrics_server ? 1 : 0
 

examples/terraform/jfrog-platform-aws-install/providers.tf

@@ -1,5 +1,6 @@
 # Setup the providers
 terraform {
+  required_version = ">= 1.0"
   # Use a local backend
   backend "local" {
     path = "./state/terraform.tfstate"
@@ -18,21 +19,32 @@ terraform {
   # }
 
   required_providers {
-    # Kubernetes provider
+    # AWS provider
     aws = {
       source  = "hashicorp/aws"
+      version = "~> 5.0"
     }
     # Kubernetes provider
     kubernetes = {
       source  = "hashicorp/kubernetes"
+      version = "~> 2.23"
     }
     # Helm provider
     helm = {
       source  = "hashicorp/helm"
+      version = "~> 3.0"
     }
   }
 }
 
 provider "aws" {
   region = var.region
 }
+
+provider "helm" {
+  kubernetes = {
+    host                   = module.eks.cluster_endpoint
+    token                  = data.aws_eks_cluster_auth.jfrog_cluster.token
+    cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
+  }
+}

examples/terraform/jfrog-platform-aws-install/variables.tf

@@ -268,6 +268,11 @@ variable "jfrog_charts_repository" {
 variable "jfrog_platform_chart_version" {
   description = "The jfrog-platform chart version"
   default = ""
+  
+  validation {
+    condition     = var.jfrog_platform_chart_version != null && var.jfrog_platform_chart_version != ""
+    error_message = "The jfrog_platform_chart_version variable must be set. Specify a valid chart version in a terraform.tfvars file (e.g., 'jfrog_platform_chart_version = \"11.1.9\"')."
+  }
 }
 
 variable "deploy_metrics_server" {

examples/terraform/jfrog-platform-aws-install/vpc.tf

@@ -9,6 +9,7 @@ data "aws_availability_zones" "available" {
 
 module "vpc" {
     source  = "terraform-aws-modules/vpc/aws"
+    version = "~> 5.0"
 
     name = "${var.env_name}-vpc"
 

stable/artifactory-cpp-ce/CHANGELOG.md

@@ -1,7 +1,7 @@
 # JFrog Artifactory CE for C++ Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.111.12] - Feb 17, 2024
+## [107.117.14] - Feb 17, 2024
 * Fixed an issue by disabling a pro-only service (Onemodel)
 * Disabling a pro-only service (Evidence)
 * Updated federation key to rtfs in cpp, jcr and oss chart

stable/artifactory-cpp-ce/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.111.12
+appVersion: 7.117.14
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.111.12
+  version: 107.117.14
 description: JFrog Artifactory CE for C++
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-cpp-ce/logo/conan.png
@@ -21,4 +21,4 @@ name: artifactory-cpp-ce
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.111.12
+version: 107.117.14

stable/artifactory-ha/CHANGELOG.md

@@ -1,7 +1,14 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.111.12] - May 15, 2025
+## [107.117.14] - August 05, 2025
+* Added support for AWS S3 V3 credentials (identity and credential) from a Kubernetes Secret
+* Added support for Azure credentials (accountName and accountKey) from a Kubernetes Secret
+* Note: `splitServicesToContainers: true` has been the default setting, and starting with releases after september 2025, the helm chart will no longer support disabling this option
+* Added emptyDir for /tmp and updated java cert dir to var/ in compliance with readOnly mode
+* Changed apiContext path from '/artifactory/service/rtfs' to '/rtfs' for rtfs
+
+## [107.111.0] - May 15, 2025
 * Added HPA support for the Artifactory HA chart, but only for primary resources. Member resources are going to be deprecated
 * Updated rtfs version to `1.6.13`
 * Added a default resource preset for PostgreSQL as small

stable/artifactory-ha/Chart.yaml

@@ -1,9 +1,9 @@
 annotations:
-  artifactoryServiceVersion: 7.111.11
-  metadataVersion: 7.155.3
-  observabilityVersion: 2.2.6
+  artifactoryServiceVersion: 7.117.13
+  metadataVersion: 7.192.0
+  observabilityVersion: 2.9.2
 apiVersion: v2
-appVersion: 7.111.12
+appVersion: 7.117.14
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -25,4 +25,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.111.12
+version: 107.117.14