Skip to content

Commit 41efcb9

Browse files
committed
replace openshift-operators with openshift-gitops-operator
Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>
1 parent 56673ff commit 41efcb9

File tree

30 files changed

+67
-65
lines changed

30 files changed

+67
-65
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727

2828
![a relative link](docs/assets/operatorhub-listing.png)
2929

30-
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.
30+
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.
3131

3232
![a relative link](docs/assets/installed-operator.png)
3333

bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=gitops-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=latest,gitops-1.8
99
LABEL operators.operatorframework.io.bundle.channel.default.v1=latest
10-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.10.0+git
10+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1313

bundle/manifests/gitops-operator.clusterserviceversion.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,17 @@ metadata:
135135
capabilities: Deep Insights
136136
console.openshift.io/plugins: '["gitops-plugin"]'
137137
containerImage: quay.io/redhat-developer/gitops-operator
138+
createdAt: "2023-07-10T15:48:47Z"
138139
description: Enables teams to adopt GitOps principles for managing cluster configurations
139140
and application delivery across hybrid multi-cluster Kubernetes environments.
140141
operatorframework.io/cluster-monitoring: "true"
141142
operatorframework.io/suggested-namespace: openshift-gitops-operator
142143
operators.openshift.io/infrastructure-features: '["disconnected"]'
143-
operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
144+
operators.operatorframework.io/builder: operator-sdk-v1.28.1
144145
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
145146
repository: https://github.com/redhat-developer/gitops-operator
146147
support: Red Hat
147-
name: gitops-operator.v1.8.0
148+
name: gitops-operator.v1.10.0-new-ns
148149
namespace: placeholder
149150
spec:
150151
apiservicedefinitions: {}
@@ -891,7 +892,7 @@ spec:
891892
value: openshift-gitops
892893
- name: OPERATOR_NAME
893894
value: gitops-operator
894-
image: quay.io/redhat-developer/gitops-operator:latest
895+
image: quay.io/jrao/gitops-operator:1.10.0-new-ns
895896
livenessProbe:
896897
httpGet:
897898
path: /healthz
@@ -977,4 +978,4 @@ spec:
977978
provider:
978979
name: Red Hat Inc
979980
replaces: gitops-operator.v1.7.3
980-
version: 1.8.0
981+
version: 1.10.0-new-ns

bundle/metadata/annotations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ annotations:
66
operators.operatorframework.io.bundle.package.v1: gitops-operator
77
operators.operatorframework.io.bundle.channels.v1: latest,gitops-1.8
88
operators.operatorframework.io.bundle.channel.default.v1: latest
9-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.10.0+git
9+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1
1010
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1111
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
1212

config/manager/kustomization.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
1212
kind: Kustomization
1313
images:
1414
- name: controller
15-
newName: quay.io/redhat-developer/gitops-operator
15+
newName: quay.io/jrao/gitops-operator
16+
newTag: 1.10.0-new-ns

docs/OpenShift GitOps Usage Guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ apiVersion: operators.coreos.com/v1alpha1
4747
kind: Subscription
4848
metadata:
4949
name: openshift-gitops-operator
50-
namespace: openshift-operators
50+
namespace: openshift-gitops-operator
5151
spec:
5252
channel: stable
5353
installPlanApproval: Automatic
@@ -165,7 +165,7 @@ spec:
165165

166166
```
167167
oc patch subscriptions.operators.coreos.com/openshift-gitops-operator \
168-
-n openshift-operators \
168+
-n openshift-gitops-operator \
169169
--type='merge' \
170170
--patch '{ "spec": { "config": { "env": [ { "name": "DISABLE_DEX", "value": "true" } ] } } }'
171171
```

scripts/e2e-common.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function dump_cluster_state() {
134134

135135
function dump_extra_cluster_state() {
136136
echo ">>> Gitops controller log:"
137-
kubectl -n openshift-operators logs $(get_app_pod argocd-operator openshift-operators) --all-containers=true
137+
kubectl -n openshift-gitops-operator logs $(get_app_pod argocd-operator openshift-gitops-operator) --all-containers=true
138138
}
139139

140140

@@ -251,11 +251,11 @@ function uninstall_operator_resources() {
251251
oc wait --for=delete $deployment -n openshift-gitops --timeout=5m || fail_test "Failed to delete deployment: $deployment in openshift-gitops namespace"
252252
done
253253

254-
oc delete $(oc get csv -n openshift-operators -o name|grep gitops) -n openshift-operators || fail_test "Unable to delete CSV"
254+
oc delete $(oc get csv -n openshift-gitops-operator -o name|grep gitops) -n openshift-gitops-operator || fail_test "Unable to delete CSV"
255255

256-
oc delete -n openshift-operators installplan $(oc get subscription gitops-operator -n openshift-operators -o jsonpath='{.status.installplan.name}') || fail_test "Unable to delete installplan"
256+
oc delete -n openshift-gitops-operator installplan $(oc get subscription gitops-operator -n openshift-gitops-operator -o jsonpath='{.status.installplan.name}') || fail_test "Unable to delete installplan"
257257

258-
oc delete subscription gitops-operator -n openshift-operators --cascade=background || fail_test "Unable to delete subscription"
258+
oc delete subscription gitops-operator -n openshift-gitops-operator --cascade=background || fail_test "Unable to delete subscription"
259259

260260
echo -e ">> Delete arogo resources accross all namespaces"
261261
for res in applications applicationsets appprojects argocds; do
@@ -273,13 +273,13 @@ function uninstall_operator_resources() {
273273

274274
function install_operator_resources() {
275275
echo -e ">>Ensure Gitops subscription exists"
276-
oc get subscription gitops-operator -n openshift-operators 2>/dev/null || \
276+
oc get subscription gitops-operator -n openshift-gitops-operator 2>/dev/null || \
277277
cat <<EOF | oc apply -f -
278278
apiVersion: operators.coreos.com/v1alpha1
279279
kind: Subscription
280280
metadata:
281281
name: gitops-operator
282-
namespace: openshift-operators
282+
namespace: openshift-gitops-operator
283283
spec:
284284
channel: $CHANNEL
285285
installPlanApproval: Automatic
@@ -288,7 +288,7 @@ spec:
288288
sourceNamespace: openshift-marketplace
289289
EOF
290290

291-
wait_until_pods_running "openshift-operators" || fail_test "openshift gitops Operator controller did not come up"
291+
wait_until_pods_running "openshift-gitops-operator" || fail_test "openshift gitops Operator controller did not come up"
292292

293293
echo ">> Wait for GitopsService creation"
294294
wait_until_object_exist "gitopsservices.pipelines.openshift.io" "cluster" "openshift-gitops" || fail_test "gitops service haven't created yet"

scripts/openshift-CI-kuttl-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export KUBECONFIG=$TMP_DIR/kubeconfig
1818
cp $KUBECONFIG /go/src/github.com/redhat-developer/gitops-operator/kubeconfig
1919

2020
# Ensuring proper installation
21-
pod=gitops-operator-controller-manager && oc get pods `oc get pods --all-namespaces | grep $pod | head -1 | awk '{print $2}'` -n openshift-operators -o yaml
22-
subscription=gitops-operator- && oc get subscription `oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-operators
21+
pod=openshift-gitops-operator-controller-manager && oc get pods `oc get pods --all-namespaces | grep $pod | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o yaml
22+
subscription=gitops-operator- && oc get subscription `oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator
2323
oc wait --for=condition=Ready -n openshift-gitops pod --timeout=15m -l 'app.kubernetes.io/name in (cluster,kam,openshift-gitops-application-controller,openshift-gitops-applicationset-controller,openshift-gitops-dex-server,openshift-gitops-redis,openshift-gitops-repo-server,openshift-gitops-server)'
2424

2525
# Check argocd instance creation

scripts/openshift-interop-kuttl-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export KUBECONFIG=$TMP_DIR/kubeconfig
1717
cp $KUBECONFIG /go/src/github.com/redhat-developer/gitops-operator/kubeconfig
1818

1919
# Ensuring proper installation
20-
pod=gitops-operator-controller-manager && oc get pods `oc get pods --all-namespaces | grep $pod | head -1 | awk '{print $2}'` -n openshift-operators -o yaml
21-
oc get subscription -n openshift-operators
20+
pod=openshift-gitops-operator-controller-manager && oc get pods `oc get pods --all-namespaces | grep $pod | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o yaml
21+
oc get subscription -n openshift-gitops-operator
2222
oc wait --for=condition=Ready -n openshift-gitops pod --timeout=15m -l 'app.kubernetes.io/name in (cluster,kam,openshift-gitops-application-controller,openshift-gitops-applicationset-controller,openshift-gitops-dex-server,openshift-gitops-redis,openshift-gitops-repo-server,openshift-gitops-server)'
2323

2424
# Check argocd instance creation

test/openshift/e2e/parallel/1-077_validate_disable_dex_removed/01-check_disable_dex_removed.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ commands:
55
set -e
66
77
if [ -z $CI ]; then
8-
operator_name_version=$(oc get subscription/openshift-gitops-operator -n openshift-operators -o jsonpath='{.status.installedCSV}')
9-
if [ "$(oc get csv/"${operator_name_version}" -n openshift-operators -o jsonpath='{.spec.install.spec.deployments[].spec.template.spec.containers[].env}' | grep DISABLE_DEX)" != '' ]; then
8+
operator_name_version=$(oc get subscription/openshift-gitops-operator -n openshift-gitops-operator -o jsonpath='{.status.installedCSV}')
9+
if [ "$(oc get csv/"${operator_name_version}" -n openshift-gitops-operator -o jsonpath='{.spec.install.spec.deployments[].spec.template.spec.containers[].env}' | grep DISABLE_DEX)" != '' ]; then
1010
echo "DISABLE_DEX env var is still present in the operator CSV."
1111
exit 1
1212
fi
1313
else
14-
operator_name_version=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-operators -o jsonpath='{.status.installedCSV}')
15-
if [ "$(oc get csv/"${operator_name_version}" -n openshift-operators -o jsonpath='{.spec.install.spec.deployments[].spec.template.spec.containers[].env}' | grep DISABLE_DEX)" != '' ]; then
14+
operator_name_version=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o jsonpath='{.status.installedCSV}')
15+
if [ "$(oc get csv/"${operator_name_version}" -n openshift-gitops-operator -o jsonpath='{.spec.install.spec.deployments[].spec.template.spec.containers[].env}' | grep DISABLE_DEX)" != '' ]; then
1616
echo "DISABLE_DEX env var is still present in the operator CSV."
1717
exit 1
1818
fi

0 commit comments

Comments
 (0)