fix merge conflicts

Signed-off-by: Jaideep Rao <[email protected]>

Author: jaideepr97

Makefile

@@ -122,6 +122,21 @@ e2e-tests-parallel:
 	@echo "Running GitOps Operator parallel E2E tests..."
 	. ./scripts/run-kuttl-tests.sh  parallel
 
+.PHONY: e2e-non-olm-tests-sequential
+e2e-non-olm-tests-sequential: ## Runs kuttl non-olm e2e sequentail tests
+	@echo "Running Non-OLM GitOps Operator sequential E2E tests..."
+	. ./hack/scripts/run-non-olm-kuttl-test.sh -t sequential
+
+.PHONY: e2e-non-olm-tests-parallel ## Runs kuttl non-olm e2e parallel tests, (Defaults to 5 runs at a time)
+e2e-non-olm-tests-parallel:
+	@echo "Running Non-OLM GitOps Operator parallel E2E tests..."
+	. ./hack/scripts/run-non-olm-kuttl-test.sh -t parallel	
+
+.PHONY: e2e-non-olm-tests-all ## Runs kuttl non-olm e2e parallel tests, (Defaults to 5 runs at a time)
+e2e-non-olm-tests-all:
+	@echo "Running Non-OLM GitOps Operator E2E tests..."
+	. ./hack/scripts/run-non-olm-kuttl-test.sh -t all		
+
 ##@ Build
 
 build: generate fmt vet ## Build manager binary.

OWNERS

@@ -10,6 +10,7 @@ approvers:
 - jopit
 - anandf
 - rnapoles-rh
+- jaideepr97
 
 reviewers:
 - sbose78
@@ -23,4 +24,7 @@ reviewers:
 - anandrkskd
 - varshab1210 
 - mehabhalodiya 
-- trdoyle81
+- trdoyle81
+- svghadi
+- reginapizza
+- ciiay

README.md

@@ -27,7 +27,7 @@ spec:
 
 ![a relative link](docs/assets/operatorhub-listing.png)
 
-3. Install the operator using the defaults in the wizard, and wait for it to show up in the list of "Installed Operators". If it doesn't install properly, you can check on its status in the "Installed Operators" tab in the `openshift-operators` namespace.
+3. Install the operator in the `openshift-gitops-operator` namesapce using the defaults in the wizard, and optionally, select the checkbox to enable cluster monitoring on the namesapce. Wait for it to show up in the list of "Installed Operators". If it doesn't install properly, you can check on its status in the "Installed Operators" tab in the `openshift-gitops-operator` namespace.
 
 ![a relative link](docs/assets/installed-operator.png)
 

bundle/manifests/argoproj.io_applications.yaml

@@ -1428,7 +1428,7 @@ spec:
                           as part of automated sync (default: false)'
                         type: boolean
                       selfHeal:
-                        description: 'SelfHeal specifies whether to revert resources
+                        description: 'SelfHeal specifes whether to revert resources
                           back to their desired state upon modification in the cluster
                           (default: false)'
                         type: boolean
@@ -1492,7 +1492,7 @@ spec:
                   conditions
                 items:
                   description: ApplicationCondition contains details about an application
-                    condition, which is usually an error or warning
+                    condition, which is usally an error or warning
                   properties:
                     lastTransitionTime:
                       description: LastTransitionTime is the time the condition was
@@ -2941,19 +2941,6 @@ spec:
                   syncResult:
                     description: SyncResult is the result of a Sync operation
                     properties:
-                      managedNamespaceMetadata:
-                        description: ManagedNamespaceMetadata contains the current
-                          sync state of managed namespace metadata
-                        properties:
-                          annotations:
-                            additionalProperties:
-                              type: string
-                            type: object
-                          labels:
-                            additionalProperties:
-                              type: string
-                            type: object
-                        type: object
                       resources:
                         description: Resources contains a list of sync result items
                           for each individual resource in a sync operation

bundle/manifests/gitops-operator.clusterserviceversion.yaml

@@ -253,7 +253,7 @@ spec:
     Audit trails of rollouts to the clusters\n* Monitoring and logging integration
     with OpenShift\n* Automated GitOps bootstrapping using Tekton and Argo CD with
     [GitOps Application Manager CLI](https://github.com/redhat-developer/kam)\n\n##
-    Components\n* Argo CD 2.7.2\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n##
+    Components\n* Argo CD 2.7.6\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n##
     How to Install \nAfter installing the OpenShift GitOps operator, an instance  of
     Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges
     for managing cluster configurations. You can create additional Argo CD instances

config/crd/bases/argoproj.io_applications.yaml

@@ -1427,7 +1427,7 @@ spec:
                           as part of automated sync (default: false)'
                         type: boolean
                       selfHeal:
-                        description: 'SelfHeal specifies whether to revert resources
+                        description: 'SelfHeal specifes whether to revert resources
                           back to their desired state upon modification in the cluster
                           (default: false)'
                         type: boolean
@@ -1491,7 +1491,7 @@ spec:
                   conditions
                 items:
                   description: ApplicationCondition contains details about an application
-                    condition, which is usually an error or warning
+                    condition, which is usally an error or warning
                   properties:
                     lastTransitionTime:
                       description: LastTransitionTime is the time the condition was
@@ -2940,19 +2940,6 @@ spec:
                   syncResult:
                     description: SyncResult is the result of a Sync operation
                     properties:
-                      managedNamespaceMetadata:
-                        description: ManagedNamespaceMetadata contains the current
-                          sync state of managed namespace metadata
-                        properties:
-                          annotations:
-                            additionalProperties:
-                              type: string
-                            type: object
-                          labels:
-                            additionalProperties:
-                              type: string
-                            type: object
-                        type: object
                       resources:
                         description: Resources contains a list of sync result items
                           for each individual resource in a sync operation

config/manifests/patches/description.yaml

@@ -13,7 +13,7 @@
     Audit trails of rollouts to the clusters\n* Monitoring and logging integration
     with OpenShift\n* Automated GitOps bootstrapping using Tekton and Argo CD with
     [GitOps Application Manager CLI](https://github.com/redhat-developer/kam)\n\n##
-    Components\n* Argo CD 2.7.2\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n##
+    Components\n* Argo CD 2.7.6\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n##
     How to Install \nAfter installing the OpenShift GitOps operator, an instance  of
     Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges
     for managing cluster configurations. You can create additional Argo CD instances

config/prometheus/monitor.yaml

@@ -19,4 +19,8 @@ spec:
         serverName: openshift-gitops-operator-metrics-service.openshift-gitops-operator.svc
   selector:
     matchLabels:
-      control-plane: gitops-operator
+<<<<<<< HEAD
+      control-plane: gitops-operator
+=======
+      control-plane: gitops-operator
+>>>>>>> 5a223ae1212252b78662554f9836f4b72417f5a4

config/rbac/auth_proxy_service.yaml

@@ -14,4 +14,7 @@ spec:
     targetPort: metrics
   selector:
     control-plane: gitops-operator
-  type: ClusterIP
+<<<<<<< HEAD
+  type: ClusterIP
+=======
+>>>>>>> 5a223ae1212252b78662554f9836f4b72417f5a4

config/rbac/kustomization.yaml

@@ -12,7 +12,7 @@ resources:
 # Comment the following 4 lines if you want to disable
 # the auth proxy (https://github.com/brancz/kube-rbac-proxy)
 # which protects your /metrics endpoint.
-- auth_proxy_service.yaml
+# - auth_proxy_service.yaml
 - auth_proxy_role.yaml
 - auth_proxy_role_binding.yaml
 # - auth_proxy_client_clusterrole.yaml

docs/OpenShift GitOps Usage Guide.md

@@ -47,7 +47,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: openshift-gitops-operator
-  namespace: openshift-operators
+  namespace: openshift-gitops-operator
 spec:
   channel: stable
   installPlanApproval: Automatic
@@ -165,7 +165,7 @@ spec:
 
 ```
 oc patch subscriptions.operators.coreos.com/openshift-gitops-operator \
--n openshift-operators \
+-n openshift-gitops-operator \
 --type='merge' \
 --patch '{ "spec": { "config": { "env": [ { "name": "DISABLE_DEX", "value": "true" } ] } } }'
 ```

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5
-	github.com/argoproj-labs/argocd-operator v0.0.16-0.20230602130515-9b15d5285e20
+	github.com/argoproj-labs/argocd-operator v0.0.16-0.20230707151228-cbc97a02a8ce
 	github.com/coreos/prometheus-operator v0.40.0
 	github.com/go-logr/logr v1.2.4
 	github.com/google/go-cmp v0.5.9
@@ -14,6 +14,7 @@ require (
 	github.com/openshift/api v3.9.1-0.20190916204813-cdbe64fb0c91+incompatible
 	github.com/operator-framework/api v0.17.5
 	github.com/stretchr/testify v1.8.2
+	go.uber.org/zap v1.24.0
 	golang.org/x/mod v0.10.0
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.27.1
@@ -33,7 +34,7 @@ require (
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/argoproj/argo-cd/v2 v2.7.1 // indirect
+	github.com/argoproj/argo-cd/v2 v2.7.6 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -75,7 +76,6 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/crypto v0.9.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect

go.sum

@@ -111,10 +111,10 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5 h1:SlFbeNb42H7DUGzE9B/uYYjlQjNSR4y+eaWiTqN3PGs=
 github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5/go.mod h1:AiEjAr6e/DCDiicjoC7W7LaZdO28sfgoBhjbGryzEZ8=
-github.com/argoproj-labs/argocd-operator v0.0.16-0.20230602130515-9b15d5285e20 h1:GuS8t9/FXbe0/FqOAn5PourGCAhIWoP+CGD5gASYH0M=
-github.com/argoproj-labs/argocd-operator v0.0.16-0.20230602130515-9b15d5285e20/go.mod h1:AfoHTRFS43YO25blmzicubPOIgApAVtW+RFBwcb8cyM=
-github.com/argoproj/argo-cd/v2 v2.7.1 h1:bioMqQ2HI95AWOI157ztppvyD0uPXGrB6h/7lHV2Fvo=
-github.com/argoproj/argo-cd/v2 v2.7.1/go.mod h1:bB2H6vHO29xf32Nzxg1CJKrJBE48r7frkzbzKxx1BKM=
+github.com/argoproj-labs/argocd-operator v0.0.16-0.20230707151228-cbc97a02a8ce h1:GuZLI2a4qTQVT4ZPKX4fPQgtAWiiOUaQ0Hqpnri6RLM=
+github.com/argoproj-labs/argocd-operator v0.0.16-0.20230707151228-cbc97a02a8ce/go.mod h1:5gJtEVwehEm9qt4Wi76Dyyi6Y36XHLkNNJ1EKrthZTg=
+github.com/argoproj/argo-cd/v2 v2.7.6 h1:AKRQm0fLGgBmKQILrpc/2PZM2WYlfCP5tquU6DqDudU=
+github.com/argoproj/argo-cd/v2 v2.7.6/go.mod h1:uRU//iTjnzlCs+hKOKo5Na2OZGNTlklnu/g9Wi4enh4=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=

hack/non-olm-install/README.md

@@ -7,19 +7,25 @@
 The `install-gitops-operator.sh` script supports two methods of installation.
 1. Using operator and component images set as environment variables (default method)
 2. Derive the operator and component images from the `ClusterServiceVersion` manifest present in the operator bundle
-**Note**: This method requires podman or docker binary to be available in the PATH environment variable. Use environment variables `USE_BUNDLE_IMG`, `BUNDLE_IMG` and `DOCKER` for this method of installation
+**Note**: Use environment variables `USE_BUNDLE_IMG`, `BUNDLE_IMG` for this method of installation
 
 
 ### Known issues and work arounds
 
-1. Missing RBAC access to update CRs in `argoproj.io` domain 
+1. Missing RBAC access to update CRs in `argoproj.io` domain
 
-Issue: (Now fixed)
+Affected versions:
+- 1.7.4 and older versions
+- 1.8.3 and older versions
 
+Fixed versions:
+- 1.8.4 and later versions
+- 1.9.0 and later versions
+
+Issue:
 https://github.com/redhat-developer/gitops-operator/issues/148
 
 Workaround:
-
 Run the following script to create the required `ClusterRole` and `ClusterRoleBinding`
 
 ```
@@ -32,7 +38,7 @@ ${KUBECTL} apply -f https://raw.githubusercontent.com/redhat-developer/gitops-op
 **Note**: If the above binaries are not present, the script installs them to temporary work directory and are removed once the script execution is complete.
 - bash (v5.0 or later)
 - git (v2.39.1 or later)
-- podman (v4.4.4 or later) or docker (Note: Required only if operator and component images need to be derived from a bundle image)
+- wget (v1.21.3 or later)
 
 ### Environment Variables
 The following environment variables can be set to configure various options for the installation/uninstallation process.
@@ -49,14 +55,14 @@ The following environment variables can be set to configure various options for
 | **IMAGE_PREFIX** | Prefix used for internal images from rh-osbs org in the registry which generally is prefixed with the target organization name | "" |
 | **USE_BUNDLE_IMG** | If the operator image and other component image needs to be derived from a bundle image, set this flag to true. | false |
 | **BUNDLE_IMG** | used only when USE_BUNDLE_IMG is set to true | `${OPERATOR_REGISTRY}/openshift-gitops-1/gitops-operator-bundle:${GITOPS_OPERATOR_VER}` |
-| **DOCKER** | used only when USE_BUNDLE_IMG is set to true. CLI binary to be used for extracting ClusterServiceVersion manifest from the Bundle Image | podman |
 
 #### Variables for 3rd party tools used in the script
 | Environment | Description |Default Value |
 | ----------- | ----------- |------------- |
 | **KUSTOMIZE_VERSION** | Version of kustomize binary to be installed if not found in PATH | v4.5.7 |
 | **KUBECTL_VERSION** | Version of the kubectl client binary to be installed if not found in PATH | v1.26.0 |
 | **YQ_VERSION** | Version of the yq binary to be installed if not found in PATH | v4.31.2 |
+| **REGCTL_VERSION** | Version of the regctl binary to be installed if not found in PATH  | v0.4.8 |
 
 #### Variables for Component Image Overrides
 | Environment | Description |Default Value |
@@ -85,13 +91,14 @@ The following environment variables can be set to configure various options for
 #### Usage
 
 ```
-install-gitops-operator.sh [--install|-i] [--uninstall|-u] [--help|-h]
+install-gitops-operator.sh [--install|-i] [--uninstall|-u] [--migrate|-m] [--help|-h]
 ```
 
 | Option | Description |
 | -------| ----------- |
 | --install, -i | installs the openshift-gitops-operator if no previous version is found, else updates (upgrade/dowgrade) the existing operator |
 | --uninstall, -u | uninstalls the openshift-gitops-operator |
+| --migrate, -m | migrates from an OLM based installation to non OLM manifests based installation|
 | --help, -h | prints the help message |
 
 #### Local Run
@@ -114,6 +121,17 @@ The below command installs the latest available openshift-gitops-operator versio
 ./install-gitops-operator.sh --uninstall
 ```
 
+##### Migration
+To migrate from an OLM based installation to the latest version using non OLM manifests based installation, run the following command.
+```
+./install-gitops-operator.sh -m
+
+```
+[or]
+```
+./install-gitops-operator.sh --migrate
+```
+
 #### Running it from a remote URL
 
 ```
@@ -180,5 +198,16 @@ rm -f ${oldauth} ${newauth}
 
 ###### Install the nightly operator bundle
 ```
-OPERATOR_REGISTRY=brew.registry.redhat.io OPERATOR_REGISTRY_ORG=rh-osbs GITOPS_OPERATOR_VER=v99.9.0-88 IMAGE_PREFIX="openshift-gitops-1-" ./install-gitops-operator.sh -i
-```
+OPERATOR_REGISTRY=brew.registry.redhat.io OPERATOR_REGISTRY_ORG=rh-osbs GITOPS_OPERATOR_VER=v99.9.0-<build_number> IMAGE_PREFIX="openshift-gitops-1-" ./install-gitops-operator.sh -i
+```
+
+###### Uninstall the nightly operator bundle
+```
+./install-gitops-operator.sh -u
+```
+
+##### Migrate from an OLM based install to non-OLM based installation (nightly-build)
+
+```
+OPERATOR_REGISTRY=brew.registry.redhat.io OPERATOR_REGISTRY_ORG=rh-osbs IMAGE_PREFIX=openshift-gitops-1- GITOPS_OPERATOR_VER=v99.9.0-<build_number> ./install-gitops-operator.sh -m
+```