Releasing jfrog registry operator v2.1.1 (#38)

oumkale · web-flow · commit a69681047148 · 2025-07-21T15:08:45.000+05:30
Signed-off-by: oumk &lt;oumk@jfrog.com&gt;
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # jfrog.com/operator-bundle:$VERSION and jfrog.com/operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= docker.jfrog.io/jfrog/jfrog-registry-operator:2.1.0
+IMAGE_TAG_BASE ?= docker.jfrog.io/jfrog/jfrog-registry-operator:2.1.1
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
diff --git a/README.md b/README.md
@@ -51,25 +51,21 @@ helm upgrade --install secretrotator jfrog/jfrog-registry-operator --set "servic
 ### For multi-user installations, if multiple service accounts need to be created:
 ```
 # In a multi-user scenario, please create all service accounts using the role ARN as an annotation via the Helm chart. This will also update the ClusterRole to grant the necessary permissions to each specific service account.
-
 # Create a custom-values.yaml file with service account details and then install operator.
 exchangedServiceAccounts:
  - name: "sample-service-account"
    namespace: "<NAMESPACE>"
    annotations:
       eks.amazonaws.com/role-arn: < role arn >
-
 helm upgrade --install secretrotator jfrog/jfrog-registry-operator --create-namespace -f custom-values.yaml -n ${NAMESPACE}
-
 Important Note: After this, you can use the service account name and namespace in custom resources. You may install multiple custom resources with different service account details.
-
 Example:
 serviceAccount:
   name: "sample-service-account"
   namespace: "<NAMESPACE>"
 ```
 
-Once operator is in running state, configure `artifactoryUrl`, `refreshTime`, `namespaceSelector`, `serviceAccount`, `generatedSecrets`, and `secretMetadata` in [secretrotator.yaml](https://github.com/jfrog/jfrog-registry-operator/blob/master/charts/jfrog-registry-operator/examples/secretrotator.yaml)
+Once operator is in running state, configure `artifactoryUrl`, `refreshTime`, `namespaceSelector`, `serviceAccount`, `generatedSecrets`, `artifactorySubdomains` and `secretMetadata` in [secretrotator.yaml](https://github.com/jfrog/jfrog-registry-operator/blob/master/charts/jfrog-registry-operator/examples/secretrotator.yaml)
 
 Sample Manifest:
 
@@ -92,6 +88,7 @@ spec:
     # - secretName: token-generic-secret
     #   secretType: generic
   artifactoryUrl: "artifactory.example.com"
+  # artifactorySubdomains: []
   refreshTime: 30m
   # serviceAccount: # The default name and namespace will be the operator’s service account name and namespace
   #   name: ""
diff --git a/charts/jfrog-registry-operator/CHANGELOG.md b/charts/jfrog-registry-operator/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Secret Rotator Operator Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [2.1.1] - June 11, 2025
+* Added subdomain support in registry operator `spec.artifactorySubdomains` [GH-34](https://github.com/jfrog/jfrog-registry-operator/pull/34)
+
 ## [2.1.0] - May 27, 2025
 * Added support for `exchangedServiceAccounts`. Using this, multiple service accounts can be created, which can later be used in `serviceAccount.name` and `serviceAccount.namespace` in the custom resource
 * Added permissions for `serviceaccounts` and `serviceaccounts/token` for the target service accounts.
diff --git a/charts/jfrog-registry-operator/Chart.yaml b/charts/jfrog-registry-operator/Chart.yaml
@@ -3,7 +3,7 @@ kubeVersion: ">= 1.19.0-0"
 type: application
 name: jfrog-registry-operator
 home: https://jfrog.com/platform/
-version: 2.1.0
+version: 2.1.1
 appVersion: 2.x-SNAPSHOT
 dependencies:
   - name: jfrog-common
diff --git a/charts/jfrog-registry-operator/crds/apps.jfrog.com_secretrotators.yaml b/charts/jfrog-registry-operator/crds/apps.jfrog.com_secretrotators.yaml
@@ -48,6 +48,12 @@ spec:
           spec:
             description: SecretRotatorSpec defines the desired state of SecretRotator
             properties:
+              artifactorySubdomains:
+                description: ArtifactorySubdomains holds a list of Artifactory subdomain
+                  names.
+                items:
+                  type: string
+                type: array
               artifactoryUrl:
                 description: ArtifactoryUrl, URL of Artifactory
                 type: string
diff --git a/charts/jfrog-registry-operator/examples/secretrotator.yaml b/charts/jfrog-registry-operator/examples/secretrotator.yaml
@@ -17,7 +17,9 @@ spec:
     # - secretName: token-generic-secret
     #   secretType: generic
   artifactoryUrl: ""
-  artifactorySubdomains: []
+  # artifactorySubdomains:
+  # - "https://docker.artifactory.company.com"
+  # - "https://base-images.artifactory.company.com"
   refreshTime: 30m
   secretMetadata:
     annotations:
@@ -31,6 +33,6 @@ spec:
     ## NOTE: You can provide either a pair of cert.pem and key.pem, or ca.pem, or all three: cert.pem, key.pem, and ca.pem. But make sure that key needs to same as cert.pem, key.pem, and ca.pem in secret
     certificateSecretName:
     insecureSkipVerify: false
-  #  serviceAccount: # The default name and namespace will be the operator’s service account name and namespace
-  #    name: ""
-  #    namespace: ""
+  # serviceAccount: # The default name and namespace will be the operator’s service account name and namespace
+  #   name: ""
+  #   namespace: ""
diff --git a/charts/jfrog-registry-operator/full-values.yaml b/charts/jfrog-registry-operator/full-values.yaml
@@ -8,7 +8,7 @@ global:
 image:
   registry: releases-docker.jfrog.io
   repository: jfrog/jfrog-registry-operator
-  tag: 2.1.0
+  tag: 2.1.1
 
   pullPolicy: IfNotPresent
   # pullSecrets:
diff --git a/charts/jfrog-registry-operator/templates/role.yaml b/charts/jfrog-registry-operator/templates/role.yaml
diff --git a/charts/jfrog-registry-operator/templates/rolebinding.yaml b/charts/jfrog-registry-operator/templates/rolebinding.yaml
diff --git a/charts/jfrog-registry-operator/values.yaml b/charts/jfrog-registry-operator/values.yaml
@@ -8,7 +8,7 @@ global:
 image:
   registry: releases-docker.jfrog.io
   repository: jfrog/jfrog-registry-operator
-  tag: 2.1.0
+  tag: 2.1.1
 
   pullPolicy: IfNotPresent
   # pullSecrets:
diff --git a/config/crd/bases/apps.jfrog.com_secretrotators.yaml b/config/crd/bases/apps.jfrog.com_secretrotators.yaml
@@ -48,6 +48,12 @@ spec:
           spec:
             description: SecretRotatorSpec defines the desired state of SecretRotator
             properties:
+              artifactorySubdomains:
+                description: ArtifactorySubdomains holds a list of Artifactory subdomain
+                  names.
+                items:
+                  type: string
+                type: array
               artifactoryUrl:
                 description: ArtifactoryUrl, URL of Artifactory
                 type: string
diff --git a/config/deploy/operator.yaml b/config/deploy/operator.yaml
@@ -67,7 +67,7 @@ spec:
           - ./operator
         args:
         - --leader-elect
-        image: releases-docker.jfrog.io/jfrog/jfrog-registry-operator:2.1.0
+        image: releases-docker.jfrog.io/jfrog/jfrog-registry-operator:2.1.1
         name: manager
         ports:
         - containerPort: 8080
diff --git a/config/samples/jfrog_v1alpha1_secretrotator.yaml b/config/samples/jfrog_v1alpha1_secretrotator.yaml
@@ -17,7 +17,9 @@ spec:
   # - secretName: token-generic-secret
   #   secretType: generic
   artifactoryUrl: ""
-  artifactorySubdomains: []
+  # artifactorySubdomains:
+  # - "https://docker.artifactory.company.com"
+  # - "https://base-images.artifactory.company.com"
   refreshTime: 30m
   secretMetadata:
     annotations:
diff --git a/internal/resource/secret.go b/internal/resource/secret.go
@@ -73,34 +73,6 @@ func getRemovedNamespaces(currentNSs v1.NamespaceList, provisionedNSs []string)
 	return removedNSs
 }
 
-//generateDockerConfigJSON creates a valid dockerconfig.json structure with the provided token and returns it as a byte slice
-func generateDockerConfigJSON(tokenb64 string, secretRotator *jfrogv1alpha1.SecretRotator) ([]byte, error) {
-	auths := make(map[string]map[string]string)
-
-	// Add the secretRotator.Spec.ArtifactoryUrl first
-	auths[secretRotator.Spec.ArtifactoryUrl] = map[string]string{
-		"auth": tokenb64,
-	}
-
-	//Add the secretRotator.Spec.ArtifactorySubdomains
-	for _, url := range secretRotator.Spec.ArtifactorySubdomains {
-		auths[url] = map[string]string{
-			"auth": tokenb64,
-		}
-	}
-
-	dockerConfig := map[string]interface{}{
-		"auths": auths,
-	}
-
-	dockerConfigBytes, err := json.Marshal(dockerConfig)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal docker config %w", err)
-	}
-
-	return dockerConfigBytes, nil
-}
-
 // DeleteSecret deletes a specific secret if it is owned by the SecretRotator.
 func DeleteSecret(ctx context.Context, secretName, secretRotatorName, namespace, secretType string, k8sClient client.Client) error {
 	existingSecret, err := GetSecret(ctx, namespace, secretName, k8sClient)
@@ -160,15 +132,15 @@ func CreateOrUpdateSecrets(req controller.Request, ctx context.Context, tokenDet
 		auth := fmt.Sprintf("%s:%s", tokenDetails.Username, tokenDetails.Token)
 		tokenb64 := base64.StdEncoding.EncodeToString([]byte(auth))
 
+		// generateDockerConfigJSON creates a valid dockerconfig.json structure
+		// with the provided token and returns it as a byte slice
 		dockerConfigBytes, err := generateDockerConfigJSON(tokenb64, secretRotator)
 		if err != nil {
 			return err
 		}
-
 		secretObj.Data = map[string][]byte{
 			operations.DockerSecretJSON: dockerConfigBytes,
 		}
-
 		secretObj.Type = corev1.SecretTypeDockerConfigJson
 	} else if secretType == operations.SecretTypeGeneric {
 		secretObj.Data = map[string][]byte{
@@ -224,3 +196,31 @@ func HandleCerts(ctx context.Context, namespace, secretName string, secretRotato
 	}
 	return nil
 }
+
+// generateDockerConfigJSON creates a valid dockerconfig.json structure with the provided token and returns it as a byte slice
+func generateDockerConfigJSON(tokenb64 string, secretRotator *jfrogv1alpha1.SecretRotator) ([]byte, error) {
+	auths := make(map[string]map[string]string)
+
+	// Add the secretRotator.Spec.ArtifactoryUrl first
+	auths[secretRotator.Spec.ArtifactoryUrl] = map[string]string{
+		"auth": tokenb64,
+	}
+
+	//Add the secretRotator.Spec.ArtifactorySubdomains
+	for _, url := range secretRotator.Spec.ArtifactorySubdomains {
+		auths[url] = map[string]string{
+			"auth": tokenb64,
+		}
+	}
+
+	dockerConfig := map[string]interface{}{
+		"auths": auths,
+	}
+
+	dockerConfigBytes, err := json.Marshal(dockerConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal docker config %w", err)
+	}
+
+	return dockerConfigBytes, nil
+}
diff --git a/terraform/operator.tf b/terraform/operator.tf
@@ -3,8 +3,8 @@ provider "aws" {
 }
 
 provider "helm" {
-  kubernetes {
-    config_path = "~/.kube/config"  # or use var.kubeconfig
+  kubernetes = {
+    config_path = "~/.kube/config"
   }
 }
 
@@ -237,7 +237,7 @@ resource "helm_release" "jfrog_operator" {
   dependency_update = true
   create_namespace = true
   values = [
-    "targetUsersServiceAccounts:\n${join("\n", [
+    "exchangedServiceAccounts:\n${join("\n", [
       for index, service_account in local.service_account_list :
       <<EOL
   - name: ${service_account}
diff --git a/tests/e2e/install/customvalues.yaml b/tests/e2e/install/customvalues.yaml
@@ -8,7 +8,7 @@ global:
 image:
   registry: releases-docker.jfrog.io
   repository: jfrog/jfrog-registry-operator
-  tag: 2.1.0
+  tag: 2.1.1
 
   pullPolicy: IfNotPresent
   # pullSecrets:

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)`
`31`	`31`	`#`
`32`	`32`	`# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both`
`33`	`33`	`# jfrog.com/operator-bundle:$VERSION and jfrog.com/operator-catalog:$VERSION.`
`34`		`-IMAGE_TAG_BASE ?= docker.jfrog.io/jfrog/jfrog-registry-operator:2.1.0`
	`34`	`+IMAGE_TAG_BASE ?= docker.jfrog.io/jfrog/jfrog-registry-operator:2.1.1`
`35`	`35`
`36`	`36`	`# BUNDLE_IMG defines the image:tag used for the bundle.`
`37`	`37`	`# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)`