Rebuilt from scratch using the same helm chart version (0.2.8)

* Renamed operator to "Orchestrator Operator" * Removed references in the name to Parodos * Rebuilt using operator-sdk v1.33 because of an issue in the make bundle operation in v1.34.1 (operator-framework/operator-sdk#6698) * Grouped roles for namespace into a single entry Signed-off-by: Jordi Gil <jgil@redhat.com>
parodos-dev · Mar 29, 2024 · e266f29 · e266f29
1 parent 322ede8
commit e266f29
Show file tree

Hide file tree

Showing 32 changed files with 178 additions and 213 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
-# If you prefer the allow list template instead of the deny list, see community template:
-# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
-#
+
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -20,3 +18,11 @@
 # Go workspace file
 go.work
 .DS_Store
+
+bin
+
+# editor and IDE paraphernalia
+.idea
+*.swp
+*.swo
+*~
diff --git a/Makefile b/Makefile
@@ -27,9 +27,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # IMAGE_TAG_BASE defines the docker.io namespace and part of the image name for remote images.
 # This variable is used to construct full image tags for bundle and catalog images.
 #
-# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
-# parodos.dev/operator-bundle:$VERSION and parodos.dev/operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= quay.io/parodos-dev/orchestrator-controller
+IMAGE_TAG_BASE ?= quay.io/orchestrator/controller-manager
 
 # 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>)
@@ -48,7 +46,7 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.34.1
+OPERATOR_SDK_VERSION ?= v1.33.0
 
 # Image URL to use all building/pushing image targets
 IMG ?= $(IMAGE_TAG_BASE):latest
@@ -95,11 +93,14 @@ docker-push: ## Push docker image with the manager.
 # To properly provided solutions that supports more than one platform you should use this option.
 PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
 .PHONY: docker-buildx
-docker-buildx: ## Build and push docker image for the manager for cross-platform support
+docker-buildx: test ## Build and push docker image for the manager for cross-platform support
+	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
+	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
 	- docker buildx create --name project-v3-builder
 	docker buildx use project-v3-builder
-	- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile .
+	- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
 	- docker buildx rm project-v3-builder
+	rm Dockerfile.cross
 
 ##@ Deployment
 
@@ -131,7 +132,7 @@ ifeq (,$(shell which kustomize 2>/dev/null))
 	@{ \
 	set -e ;\
 	mkdir -p $(dir $(KUSTOMIZE)) ;\
-	curl -sSLo - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v5.2.1/kustomize_v5.2.1_$(OS)_$(ARCH).tar.gz | \
+	curl -sSLo - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v5.0.1/kustomize_v5.0.1_$(OS)_$(ARCH).tar.gz | \
 	tar xzf - -C bin/ ;\
 	}
 else
@@ -147,7 +148,7 @@ ifeq (,$(shell which helm-operator 2>/dev/null))
 	@{ \
 	set -e ;\
 	mkdir -p $(dir $(HELM_OPERATOR)) ;\
-	curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.34.1/helm-operator_$(OS)_$(ARCH) ;\
+	curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.33.0/helm-operator_$(OS)_$(ARCH) ;\
 	chmod +x $(HELM_OPERATOR) ;\
 	}
 else
@@ -156,7 +157,7 @@ endif
 endif
 
 .PHONY: operator-sdk
-OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
+OPERATOR_SDK ?= ./bin/operator-sdk
 operator-sdk: ## Download operator-sdk locally if necessary.
 ifeq (,$(wildcard $(OPERATOR_SDK)))
 ifeq (, $(shell which operator-sdk 2>/dev/null))
@@ -187,7 +188,7 @@ bundle-push: ## Push the bundle image.
 	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
 
 .PHONY: opm
-OPM = $(LOCALBIN)/opm
+OPM = ./bin/opm
 opm: ## Download opm locally if necessary.
 ifeq (,$(wildcard $(OPM)))
 ifeq (,$(shell which opm 2>/dev/null))

diff --git a/PROJECT b/PROJECT
@@ -8,7 +8,7 @@ layout:
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
-projectName: operator
+projectName: orchestrator-operator
 resources:
 - api:
     crdVersion: v1

diff --git a/bin/kustomize b/bin/kustomize
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -4,9 +4,9 @@ FROM scratch
 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
-LABEL operators.operatorframework.io.bundle.package.v1=parodos-orchestrator-operator
+LABEL operators.operatorframework.io.bundle.package.v1=orchestrator-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.1
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
 

diff --git a/...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml b/...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml
@@ -4,13 +4,13 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: operator
+    app.kubernetes.io/created-by: orchestrator-operator
     app.kubernetes.io/instance: controller-manager-metrics-service
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: service
-    app.kubernetes.io/part-of: operator
+    app.kubernetes.io/part-of: orchestrator-operator
     control-plane: controller-manager
-  name: orchestrator-controller-manager-metrics-service
+  name: orchestrator-operator-metrics-service
 spec:
   ports:
   - name: https

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -4,12 +4,12 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: operator
+    app.kubernetes.io/created-by: orchestrator-operator
     app.kubernetes.io/instance: metrics-reader
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/part-of: operator
-  name: orchestrator-metrics-reader
+    app.kubernetes.io/part-of: orchestrator-operator
+  name: orchestrator-operator-metrics-reader
 rules:
 - nonResourceURLs:
   - /metrics

diff --git a/...fests/operator.clusterserviceversion.yaml → ...rator-operator.clusterserviceversion.yaml b/...fests/operator.clusterserviceversion.yaml → ...rator-operator.clusterserviceversion.yaml
@@ -11,16 +11,17 @@ metadata:
             "name": "orchestrator-sample"
           },
           "spec": {
+            "argocd": {
+              "enabled": false,
+              "namespace": "orchestrator-gitops",
+              "password": "",
+              "url": "",
+              "username": "admin"
+            },
             "orchestrator": {
               "devmode": false,
               "namespace": "sonataflow-infra",
               "sonataPlatform": {
-                "dataIndex": {
-                  "image": "quay.io/kiegroup/kogito-data-index-postgresql-nightly:latest"
-                },
-                "jobService": {
-                  "image": "quay.io/kiegroup/kogito-jobs-service-postgresql-nightly:latest"
-                },
                 "resources": {
                   "limits": {
                     "cpu": "500m",
@@ -31,13 +32,7 @@ metadata:
                     "memory": "64Mi"
                   }
                 }
-              },
-              "sonataflows": [
-                {
-                  "image": "quay.io/orchestrator/serverless-workflow-greeting:latest",
-                  "name": "greeting"
-                }
-              ]
+              }
             },
             "postgres": {
               "authSecret": {
@@ -61,45 +56,41 @@ metadata:
                 "clusterUrl": ""
               },
               "subscription": {
-                "channel": "alpha",
+                "channel": "fast",
                 "installPlanApproval": "Automatic",
-                "namespace": "backstage-system",
-                "pkgName": "backstage-operator",
-                "source": "rhdh-operator",
-                "sourceImage": "quay.io/janus-idp/operator-catalog:0.1.0",
-                "sourceNamespace": "openshift-marketplace"
+                "name": "rhdh",
+                "namespace": "rhdh-operator"
               }
             },
             "serverlessOperator": {
               "enabled": true,
               "subscription": {
                 "channel": "stable",
                 "installPlanApproval": "Automatic",
-                "namespace": "openshift-serverless",
-                "pkgName": "serverless-operator",
-                "sourceNamespace": "openshift-marketplace"
+                "name": "serverless-operator",
+                "namespace": "openshift-serverless"
               }
             },
             "sonataFlowOperator": {
               "enabled": true,
               "subscription": {
                 "channel": "alpha",
                 "installPlanApproval": "Automatic",
-                "namespace": "openshift-operators",
-                "pkgName": "sonataflow-operator",
-                "source": "sonataflow-operator",
-                "sourceImage": "quay.io/masayag/kogito-serverless-operator-catalog:v999.0.0-snapshot",
-                "sourceNamespace": "openshift-marketplace"
+                "name": "logic-operator-rhel8",
+                "namespace": "openshift-serverless-logic"
               }
+            },
+            "tekton": {
+              "enabled": false
             }
           }
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-03-27T21:42:46Z"
-    operators.operatorframework.io/builder: operator-sdk-v1.34.1
+    createdAt: "2024-03-28T20:50:26Z"
+    operators.operatorframework.io/builder: operator-sdk-v1.33.0
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
-  name: parodos-orchestrator-operator.v0.0.1
+  name: orchestrator-operator.v0.0.1
   namespace: openshift-operators
 spec:
   minKubeVersion: 1.27.0
@@ -108,13 +99,12 @@ spec:
     owned:
     - kind: Orchestrator
       name: orchestrators.orchestrator.parodos.dev
-      description: Parodos Orchestrator Operator
       version: v1alpha1
-  description: Parodos Orchestrator
-  displayName: Parodos Orchestrator
+  description: Orchestrator helm based operator
+  displayName: Orchestrator Operator
   icon:
-  - base64data: "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"
-    mediatype: "image/png"
+  - base64data: "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4NC44NCA5Ny40NSI+CiAgPGRlZnM+CiAgICA8c3R5bGU+CiAgICAgIC5jbHMtMSB7CiAgICAgICAgZmlsbDogIzAwMDsKICAgICAgICBzdHJva2Utd2lkdGg6IDBweDsKICAgICAgfQogICAgPC9zdHlsZT4KICA8L2RlZnM+CiAgPGcgaWQ9IkxheWVyXzItMiIgZGF0YS1uYW1lPSJMYXllciAyIj4KICAgIDxnIGlkPSJMYXllcl81IiBkYXRhLW5hbWU9IkxheWVyIDUiPgogICAgICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0yOC45MSw1NC45NWMuNiwwLDEuMy4yLDEuOS4yLDUuOSwwLDExLjEtNC4zLDEyLTEwLjMsMS02LjYtMy41LTEyLjktMTAuMS0xMy45LTMuMi0uNS02LjQuMy05LjEsMi4yLTIuNiwxLjktNC40LDQuNy00LjksNy45LTEsNi42LDMuNSwxMi45LDEwLjEsMTMuOWguMVoiLz4KICAgICAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNODQuNjEsMzMuNDVzMC0uMS0uMS0uMkw0OS4zMS4xNWMtLjItLjItLjYtLjItLjksMC0uMi4yLS4yLjYsMCwuOWwzMS43LDM1LjNoMHMxLjEuOCwyLjQuOC44LDAsMS4yLS4zYy41LS4yLjktLjYsMS0xLjEuNC0xLjEtLjItMi4zLS4zLTIuNGgwbC4yLjFaIi8+CiAgICAgIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTcxLjQxLDM0Ljc1YzAtLjItLjMtLjQtLjYtLjRoMGMtLjIsMC0uNS4yLS42LjQtMS40LDMuNC00LjksMTAuMy0xMi4yLDE4LjQtNCw0LjQtMTMuNSwxNC44LTM0LjIsMTIuNEMzLjkxLDYzLjI1LDMuMjEsMzguNjUsMy4yMSwzOC40NWMwLS4zLS4yLS42LS41LS42cy0uNi4yLS43LjRjLS4xLjUtMy44LDEzLjQtLjksMjQuMSwxLjEsNC4yLDQuNiwxMCwxMC45LDE0LjFsLTIuOCwyLjRjLS4yLjItLjMuNS0uMi43czIuOSw2LDE5LjQsMTIuM2MxMS41LDQuNCwxOC43LDUuNiwyMyw1LjZzNS41LTEsNS43LTEuMS4zLS40LjMtLjYtLjItLjQtLjUtLjVjMCwwLS4yLDAtLjUtLjItMi43LS44LTEyLjItNC4xLTIxLjItMTIuOC0uNi0uNi0xLjItMS4yLTEuOC0xLjgsMTIuOC0yLjgsMjQuNC0xNC4yLDMxLjEtMjQuMSw1LjMtNy44LDcuMi0xNC45LDcuOC0xOS41di0uM2wtLjgtMS45aDBsLS4xLjFaIi8+CiAgICA8L2c+CiAgPC9nPgo8L3N2Zz4="
+    mediatype: "image/svg+xml"
   install:
     spec:
       clusterPermissions:
@@ -123,15 +113,6 @@ spec:
           - ""
           resources:
           - namespaces
-          verbs:
-          - get
-          - list
-          - watch
-          - patch
-          - update
-        - apiGroups:
-          - ""
-          resources:
           - secrets
           verbs:
           - '*'
@@ -223,13 +204,6 @@ spec:
           - delete
           - watch
           - patch
-        - apiGroups:
-          - ""
-          resources:
-          - namespaces
-          verbs:
-          - create
-          - delete
         - apiGroups:
           - apps.openshift.io
           resources:
@@ -343,53 +317,37 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: parodos-orchestrator-operator
+        serviceAccountName: orchestrator-operator-controller-manager
       deployments:
       - label:
           app.kubernetes.io/component: manager
-          app.kubernetes.io/created-by: operator
+          app.kubernetes.io/created-by: orchestrator-operator
           app.kubernetes.io/instance: controller-manager
           app.kubernetes.io/managed-by: kustomize
           app.kubernetes.io/name: deployment
-          app.kubernetes.io/part-of: operator
-          operator.parodos.dev/name: orchestrator
-        name: parodos-orchestrator-operator
+          app.kubernetes.io/part-of: orchestrator-operator
+          control-plane: controller-manager
+        name: orchestrator-operator-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              operator.parodos.dev/name: orchestrator
+              control-plane: controller-manager
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                operator.parodos.dev/name: orchestrator
+                control-plane: controller-manager
             spec:
-              affinity:
-                nodeAffinity:
-                  requiredDuringSchedulingIgnoredDuringExecution:
-                    nodeSelectorTerms:
-                    - matchExpressions:
-                      - key: kubernetes.io/arch
-                        operator: In
-                        values:
-                        - amd64
-                        - arm64
-                        - ppc64le
-                        - s390x
-                      - key: kubernetes.io/os
-                        operator: In
-                        values:
-                        - linux
               containers:
               - args:
                 - --secure-listen-address=0.0.0.0:8443
                 - --upstream=http://127.0.0.1:8080/
                 - --logtostderr=true
                 - --v=0
-                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0
+                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
                 name: kube-rbac-proxy
                 ports:
                 - containerPort: 8443
@@ -411,8 +369,8 @@ spec:
                 - --health-probe-bind-address=:8081
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
-                - --leader-election-id=operator
-                image: quay.io/jordigilh/orchestrator-controller:latest
+                - --leader-election-id=orchestrator-operator
+                image: quay.io/orchestrator/controller-manager:latest
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -440,7 +398,7 @@ spec:
                     - ALL
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: parodos-orchestrator-operator
+              serviceAccountName: orchestrator-operator
               terminationGracePeriodSeconds: 10
       permissions:
       - rules:
@@ -475,7 +433,7 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: parodos-orchestrator-operator
+        serviceAccountName: orchestrator-operator
     strategy: deployment
   installModes:
   - supported: false
@@ -487,10 +445,9 @@ spec:
   - supported: true
     type: AllNamespaces
   keywords:
-  - parodos
   - orchestrator
   links:
-  - name: Operator
+  - name: Orchestrator Operator
     url: https://github.com/parodos-dev/orchestrator-helm-operator
   maturity: alpha
   provider: