NO-ISSUE: Synchronize From Upstream Repositories

CONTRIBUTING.md

@@ -44,7 +44,7 @@ you can follow the steps below to test your changes:
 1. Create the cluster:
 
     ```sh
-    kind create cluster operator-controller
+    kind create cluster -n operator-controller
     ```
 
 2. Build your changes:

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: 6d79092c8921f888b125e084b494576e87d5706e
+expectedMergeBase: 63ef90209b014efab9e39caeb19923cbfd6f2cc2
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

config/base/kustomization.yaml

@@ -18,119 +18,5 @@ resources:
 - crd
 - rbac
 - manager
-# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
-# crd/kustomization.yaml
-#- ../webhook
-# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
-#- ../certmanager
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 #- ../prometheus
-
-# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
-# crd/kustomization.yaml
-#- manager_webhook_patch.yaml
-
-# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
-# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
-# 'CERTMANAGER' needs to be enabled to use ca injection
-#- webhookcainjection_patch.yaml
-
-# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
-# Uncomment the following replacements to add the cert-manager CA injection annotations
-#replacements:
-#  - source: # Add cert-manager annotation to ValidatingWebhookConfiguration, MutatingWebhookConfiguration and CRDs
-#      kind: Certificate
-#      group: cert-manager.io
-#      version: v1
-#      name: serving-cert # this name should match the one in certificate.yaml
-#      fieldPath: .metadata.namespace # namespace of the certificate CR
-#    targets:
-#      - select:
-#          kind: ValidatingWebhookConfiguration
-#        fieldPaths:
-#          - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#        options:
-#          delimiter: '/'
-#          index: 0
-#          create: true
-#      - select:
-#          kind: MutatingWebhookConfiguration
-#        fieldPaths:
-#          - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#        options:
-#          delimiter: '/'
-#          index: 0
-#          create: true
-#      - select:
-#          kind: CustomResourceDefinition
-#        fieldPaths:
-#          - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#        options:
-#          delimiter: '/'
-#          index: 0
-#          create: true
-#  - source:
-#      kind: Certificate
-#      group: cert-manager.io
-#      version: v1
-#      name: serving-cert # this name should match the one in certificate.yaml
-#      fieldPath: .metadata.name
-#    targets:
-#      - select:
-#          kind: ValidatingWebhookConfiguration
-#        fieldPaths:
-#          - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#        options:
-#          delimiter: '/'
-#          index: 1
-#          create: true
-#      - select:
-#          kind: MutatingWebhookConfiguration
-#        fieldPaths:
-#          - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#        options:
-#          delimiter: '/'
-#          index: 1
-#          create: true
-#      - select:
-#          kind: CustomResourceDefinition
-#        fieldPaths:
-#          - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#        options:
-#          delimiter: '/'
-#          index: 1
-#          create: true
-#  - source: # Add cert-manager annotation to the webhook Service
-#      kind: Service
-#      version: v1
-#      name: webhook-service
-#      fieldPath: .metadata.name # namespace of the service
-#    targets:
-#      - select:
-#          kind: Certificate
-#          group: cert-manager.io
-#          version: v1
-#        fieldPaths:
-#          - .spec.dnsNames.0
-#          - .spec.dnsNames.1
-#        options:
-#          delimiter: '.'
-#          index: 0
-#          create: true
-#  - source:
-#      kind: Service
-#      version: v1
-#      name: webhook-service
-#      fieldPath: .metadata.namespace # namespace of the service
-#    targets:
-#      - select:
-#          kind: Certificate
-#          group: cert-manager.io
-#          version: v1
-#        fieldPaths:
-#          - .spec.dnsNames.0
-#          - .spec.dnsNames.1
-#        options:
-#          delimiter: '.'
-#          index: 1
-#          create: true

config/base/prometheus/monitor.yaml

@@ -1,4 +1,3 @@
-
 # Prometheus Monitor Service (Metrics)
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

docs/concepts/controlling-catalog-selection.md

@@ -21,16 +21,21 @@ To select a specific catalog by name, you can use the `matchLabels` field in you
 apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
-  name: my-extension
+  name: argocd
 spec:
-  packageName: my-package
-  catalog:
-    selector:
-      matchLabels:
-        olm.operatorframework.io/metadata.name: my-content-management
+  namespace: argocd
+  serviceAccount:
+    name: argocd-installer
+  source:
+    sourceType: Catalog
+    catalog:
+      packageName: argocd-operator
+      selector:
+        matchLabels:
+          olm.operatorframework.io/metadata.name: operatorhubio
 ```
 
-In this example, only the catalog named `my-catalog` will be considered when resolving `my-package`.
+In this example, only the catalog named `operatorhubio` will be considered when resolving `argocd-operator`.
 
 ### Selecting Catalogs by Labels
 
@@ -42,13 +47,18 @@ If you have catalogs labeled with specific metadata, you can select them using `
 apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
-  name: my-extension
+  name: argocd
 spec:
-  packageName: my-package
-  catalog:
-    selector:
-      matchLabels:
-        example.com/support: "true"
+  namespace: argocd
+  serviceAccount:
+    name: argocd-installer
+  source:
+    sourceType: Catalog
+    catalog:
+      packageName: argocd-operator
+      selector:
+        matchLabels:
+          example.com/support: "true"
 ```
 
 This selects catalogs labeled with `example.com/support: "true"`.
@@ -59,17 +69,22 @@ This selects catalogs labeled with `example.com/support: "true"`.
 apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
-  name: my-extension
+  name: argocd
 spec:
-  packageName: my-package
-  catalog:
-    selector:
-      matchExpressions:
-        - key: example.com/support
-          operator: In
-          values:
-            - "gold"
-            - "platinum"
+  namespace: argocd
+  serviceAccount:
+    name: argocd-installer
+  source:
+    sourceType: Catalog
+    catalog:
+      packageName: argocd-operator
+      selector:
+        matchExpressions:
+          - key: example.com/support
+            operator: In
+            values:
+              - "gold"
+              - "platinum"
 ```
 
 This selects catalogs where the label `example.com/support` has the value `gold` or `platinum`.
@@ -84,16 +99,21 @@ You can exclude catalogs by using the `NotIn` or `DoesNotExist` operators in `ma
 apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
-  name: my-extension
+  name: argocd
 spec:
-  packageName: my-package
-  catalog:
-    selector:
-      matchExpressions:
-        - key: olm.operatorframework.io/metadata.name
-          operator: NotIn
-          values:
-            - unwanted-content-management
+  namespace: argocd
+  serviceAccount:
+    name: argocd-installer
+  source:
+    sourceType: Catalog
+    catalog:
+      packageName: argocd-operator
+      selector:
+        matchExpressions:
+          - key: olm.operatorframework.io/metadata.name
+            operator: NotIn
+            values:
+              - unwanted-catalog
 ```
 
 This excludes the catalog named `unwanted-catalog` from consideration.
@@ -104,14 +124,19 @@ This excludes the catalog named `unwanted-catalog` from consideration.
 apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
-  name: my-extension
+  name: argocd
 spec:
-  packageName: my-package
-  catalog:
-    selector:
-      matchExpressions:
-        - key: example.com/support
-          operator: DoesNotExist
+  namespace: argocd
+  serviceAccount:
+    name: argocd-installer
+  source:
+    sourceType: Catalog
+    catalog:
+      packageName: argocd-operator
+      selector:
+        matchExpressions:
+          - key: example.com/support
+            operator: DoesNotExist
 ```
 
 This selects catalogs that do not have the `example.com/support` label.
@@ -200,11 +225,16 @@ If the system cannot resolve to a single bundle due to ambiguity, it will genera
     metadata:
       name: install-my-operator
     spec:
-      packageName: my-operator
-      catalog:
-        selector:
-          matchLabels:
-            example.com/support: "true"
+      namespace: my-operator-ns
+      serviceAccount:
+        name: my-operator-installer
+      source:
+        sourceType: Catalog
+        catalog:
+          packageName: my-operator
+          selector:
+            matchLabels:
+              example.com/support: "true"
     ```
 
 3. **Apply the Resources**

docs/concepts/crd-upgrade-safety.md

@@ -53,26 +53,26 @@ not cause the CRD Upgrade Safety preflight check to halt the upgrade:
 ## Disabling CRD Upgrade Safety
 
 The CRD Upgrade Safety preflight check can be entirely disabled by adding the
-`preflight.crdUpgradeSafety.disabled` field with a value of "true" to the ClusterExtension of the CRD.
+`.spec.install.preflight.crdUpgradeSafety.enforcement` field with a value of `None` to the `ClusterExtension` of the CRD.
 
 ```yaml
 apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
-    name: clusterextension-sample
+  name: argocd
 spec:
-    source:
-      sourceType: Catalog
-      catalog:
-        packageName: argocd-operator
-        version: 0.6.0
-    install:
-      namespace: default
-      serviceAccount:
-        name: argocd-installer
-      preflight:
-        crdUpgradeSafety:
-          disabled: true
+  namespace: argocd
+  serviceAccount:
+    name: argocd-installer
+  source:
+    sourceType: Catalog
+    catalog:
+      packageName: argocd-operator
+      version: 0.6.0
+  install:
+    preflight:
+      crdUpgradeSafety:
+        enforcement: None
 ```
 
 You cannot disable individual field validators. If you disable the CRD Upgrade Safety preflight check, all field validators are disabled.