Merge pull request #27 from shahiinn/master

Release of jfrog-registry-operator 1.4.1
jfrog · Sep 3, 2024 · 2402546 · 2402546
2 parents 2cc06e0 + 40cf463
commit 2402546
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
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:1.3.0
+IMAGE_TAG_BASE ?= docker.jfrog.io/jfrog/jfrog-registry-operator:1.4.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/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.
 
+## [1.4.1] - Sept 03, 2024
+* Release of jfrog-registry-operator `1.4.1`
+
 ## [1.3.0] - Jul 17, 2024
 * Release of jfrog-registry-operator `1.3.0`
 

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: 1.3.0
+version: 1.4.1
 appVersion: 1.x-SNAPSHOT
 dependencies:
   - name: jfrog-common

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: 1.3.0
+  tag: 1.4.1
 
   pullPolicy: IfNotPresent
   # pullSecrets:

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: 1.3.0
+  tag: 1.4.1
 
   pullPolicy: IfNotPresent
   # pullSecrets:

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:1.3.0
+        image: releases-docker.jfrog.io/jfrog/jfrog-registry-operator:1.4.1
         name: manager
         ports:
         - containerPort: 8080

diff --git a/controllers/secretrotator_operations.go b/controllers/secretrotator_operations.go
@@ -49,10 +49,13 @@ func (r *SecretRotatorReconciler) InitializeResource(ctx context.Context, tokenD
 		return err
 	}
 
-	// HandleCerts method copies certificates into the container
-	if err := resource.HandleCerts(ctx, secretRotator.Spec.Security.SecretNamespace, secretRotator.Spec.Security.CertificateSecretName, secretRotator.Name, r.Client); err != nil {
-		return err
+	if secretRotator.Spec.Security.Enabled {
+		// HandleCerts method copies certificates into the container
+		if err := resource.HandleCerts(ctx, secretRotator.Spec.Security.SecretNamespace, secretRotator.Spec.Security.CertificateSecretName, secretRotator.Name, r.Client); err != nil {
+			return err
+		}
 	}
+
 	return nil
 }
 

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: 1.3.0
+  tag: 1.4.1
 
   pullPolicy: IfNotPresent
   # pullSecrets: