Skip to content

Commit c817ee3

Browse files
Add annotation to set insecureSkipTLSVerify
Signed-off-by: Varsha Prasad Narsing <[email protected]>
1 parent 00dbc12 commit c817ee3

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

internal/controllers/clusterextension_controller.go

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ type InstalledBundleGetter interface {
9797
GetInstalledBundle(ctx context.Context, acg helmclient.ActionClientGetter, allBundles []*catalogmetadata.Bundle, ext *ocv1alpha1.ClusterExtension) (*catalogmetadata.Bundle, error)
9898
}
9999

100+
const (
101+
bundleConnectionAnnotation string = "bundle.connection.config/insecureSkipTLSVerify"
102+
)
103+
100104
//+kubebuilder:rbac:groups=olm.operatorframework.io,resources=clusterextensions,verbs=get;list;watch
101105
//+kubebuilder:rbac:groups=olm.operatorframework.io,resources=clusterextensions/status,verbs=update;patch
102106
//+kubebuilder:rbac:groups=olm.operatorframework.io,resources=clusterextensions/finalizers,verbs=update
@@ -532,13 +536,24 @@ func (r *ClusterExtensionReconciler) generateBundleDeploymentForUnpack(bundlePat
532536
Type: rukpakv1alpha2.SourceTypeImage,
533537
Image: &rukpakv1alpha2.ImageSource{
534538
Ref: bundlePath,
535-
InsecureSkipTLSVerify: true,
539+
InsecureSkipTLSVerify: isInsecureSkipTLSVerifySet(ce),
536540
},
537541
},
538542
},
539543
}
540544
}
541545

546+
func isInsecureSkipTLSVerifySet(ce *ocv1alpha1.ClusterExtension) bool {
547+
if ce == nil {
548+
return false
549+
}
550+
value, ok := ce.Annotations[bundleConnectionAnnotation]
551+
if !ok {
552+
return false
553+
}
554+
return value == "true"
555+
}
556+
542557
// SetupWithManager sets up the controller with the Manager.
543558
func (r *ClusterExtensionReconciler) SetupWithManager(mgr ctrl.Manager) error {
544559
controller, err := ctrl.NewControllerManagedBy(mgr).

test/e2e/cluster_extension_install_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ func testInit(t *testing.T) (*ocv1alpha1.ClusterExtension, *catalogd.Catalog) {
4545
clusterExtension := &ocv1alpha1.ClusterExtension{
4646
ObjectMeta: metav1.ObjectMeta{
4747
Name: clusterExtensionName,
48+
Annotations: map[string]string{
49+
"bundle.connection.config/insecureSkipTLSVerify": "true",
50+
},
4851
},
4952
}
5053
return clusterExtension, extensionCatalog

0 commit comments

Comments
 (0)