revert back --skip-tls flag changes with deprecation notice (#5633)

* revert back --skip-tls with deprecation notice

Signed-off-by: laxmikantbpandhare <[email protected]>

* added changelog

Signed-off-by: laxmikantbpandhare <[email protected]>

* modified according to test sanity changes

Signed-off-by: laxmikantbpandhare <[email protected]>

* modified according to suggestion

Signed-off-by: laxmikantbpandhare <[email protected]>

* removed use-http flag

Signed-off-by: laxmikantbpandhare <[email protected]>

* modified tag to use http

Signed-off-by: laxmikantbpandhare <[email protected]>

* added typos

Signed-off-by: laxmikantbpandhare <[email protected]>

* removed comment

Signed-off-by: laxmikantbpandhare <[email protected]>

* removed field as it is not used in registry pod

Signed-off-by: laxmikantbpandhare <[email protected]>

Author: laxmikantbpandhare

changelog/fragments/revert-skiptls-changes-deprc-notice.yaml

@@ -0,0 +1,5 @@
+entries:
+  - description: >
+      Reverted removal of  `--skip-tls` flag and mark the flag as deprecated.
+    kind: addition
+    breaking: false

internal/olm/operator/bundle/install.go

@@ -71,6 +71,11 @@ func (i *Install) setup(ctx context.Context) error {
 		}
 	}
 
+	//if user sets --skip-tls then set --use-http to true as --skip-tls is deprecated
+	if i.SkipTLS {
+		i.UseHTTP = true
+	}
+
 	// Load bundle labels and set label-dependent values.
 	labels, bundle, err := operator.LoadBundle(ctx, i.BundleImage, i.SkipTLSVerify, i.UseHTTP)
 	if err != nil {

internal/olm/operator/registry/index_image.go

@@ -62,6 +62,7 @@ type IndexImageCatalogCreator struct {
 	PackageName   string
 	IndexImage    string
 	BundleImage   string
+	SkipTLS       bool
 	SkipTLSVerify bool
 	UseHTTP       bool
 	BundleAddMode index.BundleAddMode
@@ -89,6 +90,11 @@ func (c *IndexImageCatalogCreator) BindFlags(fs *pflag.FlagSet) {
 		"Name of a generic secret containing a PEM root certificate file required to pull bundle images. "+
 			"This secret *must* be in the namespace that this command is configured to run in, "+
 			"and the file *must* be encoded under the key \"cert.pem\"")
+
+	_ = fs.MarkDeprecated("skip-tls", "use --skip-tls-verify or --use-http instead")
+	fs.BoolVar(&c.SkipTLS, "skip-tls", false, "skip authentication of image registry TLS "+
+		"certificate when pulling a bundle image in-cluster")
+
 	fs.BoolVar(&c.SkipTLSVerify, "skip-tls-verify", false, "skip TLS certificate verification for container image registries "+
 		"while pulling bundles")
 	fs.BoolVar(&c.UseHTTP, "use-http", false, "use plain HTTP for container image registries "+

website/content/en/docs/cli/operator-sdk_run_bundle-upgrade.md

@@ -23,6 +23,7 @@ operator-sdk run bundle-upgrade <bundle-image> [flags]
   -n, --namespace string          If present, namespace scope for this CLI request
       --pull-secret-name string   Name of image pull secret ("type: kubernetes.io/dockerconfigjson") required to pull bundle images. This secret *must* be both in the namespace and an imagePullSecret of the service account that this command is configured to run in
       --service-account string    Service account name to bind registry objects to. If unset, the default service account is used. This value does not override the operator's service account
+      --skip-tls                  skip authentication of image registry TLS certificate when pulling a bundle image in-cluster
       --skip-tls-verify           skip TLS certificate verification for container image registries while pulling bundles
       --timeout duration          Duration to wait for the command to complete before failing (default 2m0s)
       --use-http                  use plain HTTP for container image registries while pulling bundles

website/content/en/docs/cli/operator-sdk_run_bundle.md

@@ -25,6 +25,7 @@ operator-sdk run bundle <bundle-image> [flags]
   -n, --namespace string                If present, namespace scope for this CLI request
       --pull-secret-name string         Name of image pull secret ("type: kubernetes.io/dockerconfigjson") required to pull bundle images. This secret *must* be both in the namespace and an imagePullSecret of the service account that this command is configured to run in
       --service-account string          Service account name to bind registry objects to. If unset, the default service account is used. This value does not override the operator's service account
+      --skip-tls                        skip authentication of image registry TLS certificate when pulling a bundle image in-cluster
       --skip-tls-verify                 skip TLS certificate verification for container image registries while pulling bundles
       --timeout duration                Duration to wait for the command to complete before failing (default 2m0s)
       --use-http                        use plain HTTP for container image registries while pulling bundles