OCPBUGS-59046: Synchronize From Upstream Repositories

.tilt-support

@@ -130,23 +130,24 @@ def process_yaml(yaml):
 
 # data format:
 # {
-#     'image': 'quay.io/operator-framework/rukpak',
-#     'yaml': 'manifests/overlays/cert-manager',
-#     'binaries': {
-#         'core': 'core',
-#         'crdvalidator': 'crd-validation-webhook',
-#         'helm': 'helm-provisioner',
-#         'webhooks': 'rukpak-webhooks',
+#     'repos': {
+#         'catalogd': {
+#             'image': 'quay.io/operator-framework/catalogd',
+#             'binary': './cmd/catalogd',
+#             'deployment': 'catalogd-controller-manager',
+#             'deps': ['api', 'cmd/catalogd', 'internal/catalogd', 'internal/shared', 'go.mod', 'go.sum'],
+#             'starting_debug_port': 20000,
+#         },
+#         ... additional entries here ...
 #     },
-#     'deps': ['api', 'cmd/binary_name', 'internal', 'pkg'],
-# },
-def deploy_repo(repo, data, tags="", debug=True):
-    print('Deploying repo {}'.format(repo))
-    deploy_cert_manager_if_needed()
+#     'yaml': 'config/overlays/tilt-local-dev',
+# }
 
-    local_port = data['starting_debug_port']
-    for binary, deployment in data['binaries'].items():
-        build_binary(repo, binary, data['deps'], data['image'], tags, debug)
-        k8s_resource(deployment, port_forwards=['{}:30000'.format(local_port)])
-        local_port += 1
+def deploy_repo(data, tags="", debug=True):
+    deploy_cert_manager_if_needed()
+    for reponame, repo in data['repos'].items():
+        print('Deploying repo {}'.format(reponame))
+        local_port = repo['starting_debug_port']
+        build_binary(reponame, repo['binary'], repo['deps'], repo['image'], tags, debug)
+        k8s_resource(repo['deployment'], port_forwards=['{}:30000'.format(local_port)])
     process_yaml(kustomize(data['yaml']))

Makefile

@@ -163,6 +163,7 @@ manifests: $(CONTROLLER_GEN) $(KUSTOMIZE) #EXHELP Generate WebhookConfiguration,
 
 .PHONY: generate
 generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
+	@find api cmd hack internal -name "zz_generated.deepcopy.go" -delete # Need to delete the files for them to be generated properly
 	$(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 .PHONY: verify
@@ -251,7 +252,6 @@ E2E_REGISTRY_IMAGE=localhost/e2e-test-registry:devel
 image-registry: export GOOS=linux
 image-registry: export GOARCH=amd64
 image-registry: ## Build the testdata catalog used for e2e tests and push it to the image registry
-	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/registry/bin/registry ./testdata/registry/registry.go
 	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push         ./testdata/push/push.go
 	$(CONTAINER_RUNTIME) build -f ./testdata/Dockerfile -t $(E2E_REGISTRY_IMAGE) ./testdata
 	$(CONTAINER_RUNTIME) save $(E2E_REGISTRY_IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)

Tiltfile

@@ -1,24 +1,23 @@
 load('.tilt-support', 'deploy_repo')
 
-operator_controller = {
-    'image': 'quay.io/operator-framework/operator-controller',
-    'yaml': 'config/overlays/tilt-local-dev/operator-controller',
-    'binaries': {
-        './cmd/operator-controller': 'operator-controller-controller-manager',
+olmv1 = {
+    'repos': {
+        'catalogd': {
+            'image': 'quay.io/operator-framework/catalogd',
+            'binary': './cmd/catalogd',
+            'deployment': 'catalogd-controller-manager',
+            'deps': ['api', 'cmd/catalogd', 'internal/catalogd', 'internal/shared', 'go.mod', 'go.sum'],
+            'starting_debug_port': 20000,
+        },
+        'operator-controller': {
+            'image': 'quay.io/operator-framework/operator-controller',
+            'binary': './cmd/operator-controller',
+            'deployment': 'operator-controller-controller-manager',
+            'deps': ['api', 'cmd/operator-controller', 'internal/operator-controller', 'internal/shared', 'go.mod', 'go.sum'],
+            'starting_debug_port': 30000,
+        },
     },
-    'deps': ['api', 'cmd/operator-controller', 'internal/operator-controller', 'internal/shared', 'go.mod', 'go.sum'],
-    'starting_debug_port': 30000,
+    'yaml': 'config/overlays/tilt-local-dev',
 }
-deploy_repo('operator-controller', operator_controller, '-tags containers_image_openpgp')
 
-catalogd = {
-    'image': 'quay.io/operator-framework/catalogd',
-    'yaml': 'config/overlays/tilt-local-dev/catalogd',
-    'binaries': {
-        './cmd/catalogd': 'catalogd-controller-manager',
-    },
-    'deps': ['api', 'cmd/catalogd', 'internal/catalogd', 'internal/shared', 'go.mod', 'go.sum'],
-    'starting_debug_port': 20000,
-}
-
-deploy_repo('catalogd', catalogd, '-tags containers_image_openpgp')
+deploy_repo(olmv1, '-tags containers_image_openpgp')

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: 7d4414b1f9188d1af01034010cd921e6d62f657d
+expectedMergeBase: 36809b312a523019c98655a9fda396e0f1588318
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

config/components/base/experimental/kustomization.yaml

@@ -8,10 +8,10 @@ resources:
 components:
 - ../common
 # EXPERIMENTAL FEATURES ARE LISTED HERE
-- ../../features/synthetic-user-permissions
 - ../../features/webhook-provider-certmanager
 - ../../features/single-own-namespace
 - ../../features/preflight-permissions
 - ../../features/apiv1-metas-handler
+- ../../features/helm-chart
 # This one is downstream only, so we shant use it
 # - ../../features/webhook-provider-openshift-serviceca

config/components/features/helm-chart/kustomization.yaml

@@ -0,0 +1,9 @@
+# DO NOT ADD A NAMESPACE HERE
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+patches:
+ - target:
+      kind: Deployment
+      name: operator-controller-controller-manager
+   path: patches/enable-featuregate.yaml

config/components/features/helm-chart/patches/enable-featuregate.yaml

@@ -0,0 +1,4 @@
+# enable Helm chart support feature gate
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value: "--feature-gates=HelmChartSupport=true"

config/overlays/tilt-local-dev/kustomization.yaml

@@ -0,0 +1,20 @@
+# kustomization file for secure OLMv1
+# DO NOT ADD A NAMESPACE HERE
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonAnnotations:
+  olm.operatorframework.io/feature-set: tilt-experimental
+components:
+- ../../components/base/experimental
+# This must be last due to namespace overwrite issues of the ca
+- ../../components/cert-manager
+patches:
+- target:
+    kind: Deployment
+    name: operator-controller-controller-manager
+  path: patches/operator-controller.yaml
+- target:
+    kind: Deployment
+    name: catalogd-controller-manager
+  path: patches/catalogd.yaml
+

config/overlays/tilt-local-dev/catalogd/patches/dev-deployment.yaml → config/overlays/tilt-local-dev/patches/operator-controller.yaml

@@ -7,4 +7,4 @@
   value: null
 - op: remove
   # remove --leader-elect so container doesn't restart during breakpoints
-  path: /spec/template/spec/containers/0/args/0
+  path: /spec/template/spec/containers/0/args/2