Make the --pip-install and --packages dependencies optional

Author: Patrick J. McNerthney

Dockerfile

@@ -4,12 +4,12 @@ COPY dist/*.whl /root
 WORKDIR /
 RUN \
   set -eux && \
-  pip install --root-user-action ignore --no-build-isolation /root/*.whl && \
+  pip install --root-user-action ignore --no-build-isolation $(echo /root/*.whl)[packages,pip-install] && \
   rm -rf /root/*.whl /root/.cache && \
   groupadd --gid 2000 pythonic && \
   useradd --uid 2000 --gid pythonic --home-dir /opt/pythonic --create-home --shell /usr/sbin/nologin pythonic
 
 USER pythonic:pythonic
 WORKDIR /opt/pythonic
 EXPOSE 9443
-ENTRYPOINT ["python", "-m", "crossplane.pythonic.main"]
+ENTRYPOINT ["function-pythonic"]

crossplane/pythonic/composite.py

@@ -637,15 +637,6 @@ def fatal(self, fatal):
             else:
                 self._result.severity = fnv1.Severity.SEVERITY_NORMAL
 
-    @property
-    def message(self):
-        return self._result.message if bool(self) else None
-
-    @message.setter
-    def message(self, message):
-        if bool(self):
-            self._result.message = message
-
     @property
     def reason(self):
         return self._result.reason if bool(self) else None
@@ -655,6 +646,15 @@ def reason(self, reason):
         if bool(self):
             self._result.reason = reason
 
+    @property
+    def message(self):
+        return self._result.message if bool(self) else None
+
+    @message.setter
+    def message(self, message):
+        if bool(self):
+            self._result.message = message
+
     @property
     def claim(self):
         return bool(self) and self._result == fnv1.Target.TARGET_COMPOSITE_AND_CLAIM

crossplane/pythonic/main.py

@@ -13,7 +13,6 @@
 import crossplane.function.logging
 import crossplane.function.proto.v1.run_function_pb2_grpc as grpcv1
 import grpc
-import pip._internal.cli.main
 
 from . import function
 
@@ -24,7 +23,7 @@ def main():
 
 class Main:
     async def main(self):
-        parser = argparse.ArgumentParser('Forta Crossplane Function')
+        parser = argparse.ArgumentParser('Crossplane Function Pythonic')
         parser.add_argument(
             '--debug', '-d',
             action='store_true',
@@ -40,18 +39,18 @@ async def main(self):
         parser.add_argument(
             '--address',
             default='0.0.0.0:9443',
-            help='Address at which to listen for gRPC connections, default: 0.0.0.0:9443',
+            help='Address to listen on for gRPC connections, default: 0.0.0.0:9443',
         )
         parser.add_argument(
             '--tls-certs-dir',
             default=os.getenv('TLS_SERVER_CERTS_DIR'),
             metavar='DIRECTORY',
-            help='Serve using mTLS certificates.',
+            help='Serve using TLS certificates.',
         )
         parser.add_argument(
             '--insecure',
             action='store_true',
-            help='Run without mTLS credentials. If you supply this flag --tls-certs-dir will be ignored.',
+            help='Run without mTLS credentials, --tls-certs-dir will be ignored.',
         )
         parser.add_argument(
             '--packages',
@@ -97,7 +96,8 @@ async def main(self):
         self.configure_logging(args)
 
         if args.pip_install:
-            pip._internal.cli.main.main(['install', *shlex.split(args.pip_install)])
+            import pip._internal.cli.main
+            pip._internal.cli.main.main(['install', '--user', *shlex.split(args.pip_install)])
 
         # enables read only volumes or mismatched uid volumes
         sys.dont_write_bytecode = True
@@ -128,7 +128,8 @@ async def main(self):
             )
         else:
             if not args.insecure:
-                raise ValueError('Either --tls-certs-dir or --insecure must be specified')
+                print('Either --tls-certs-dir or --insecure must be specified', file=sys.stderr)
+                sys.exit(1)
             grpc_server.add_insecure_port(args.address)
         await grpc_server.start()
 

crossplane/pythonic/packages.py

@@ -14,7 +14,7 @@
 PACKAGES_DIR = None
 
 
-def operator(grpc_server, grpc_runner, packages_secrets, packages_namespace, packages_dir):
+def operator(grpc_server, grpc_runner, packages_secrets, packages_namespaces, packages_dir):
     logging.getLogger('kopf.objects').setLevel(logging.INFO)
     global GRPC_SERVER, GRPC_RUNNER, PACKAGES_DIR
     GRPC_SERVER = grpc_server
@@ -28,8 +28,8 @@ def operator(grpc_server, grpc_runner, packages_secrets, packages_namespace, pac
         kopf.on.delete('', 'v1', 'secrets', labels=PACKAGE_LABEL)(delete)
     return kopf.operator(
         standalone=True,
-        clusterwide=not packages_namespace,
-        namespaces=packages_namespace,
+        clusterwide=not packages_namespaces,
+        namespaces=packages_namespaces,
     )
 
 

examples/helm-copy-secret/vcluster.py

@@ -15,7 +15,7 @@ def compose(self):
         release.spec.forProvider.namespace = namespace
         release.spec.forProvider.values.controlPlane.proxy.extraSANs[0] = f'{name}.{namespace}'
         vcluster_secret = self.requireds.vcluster_secret('v1', 'Secret', namespace, secret_name)[0]
-        argocd_secret = self.resources.argocd_secret('v1', 'Secret', 'default', secret_name)
+        argocd_secret = self.resources.argocd_secret('v1', 'Secret', 'argocd', secret_name)
         argocd_secret.metadata.labels['argocd.argoproj.io/secret-type'] = 'cluster'
         argocd_secret.type = 'Opaque'
         argocd_secret.data.name = B64Encode(name)

pyproject.toml

@@ -14,13 +14,16 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 
+dynamic = ["version"]
+
 dependencies = [
   "crossplane-function-sdk-python==0.9.0",
-  "kopf==1.38.0",
   "pyyaml==6.0.2",
 ]
 
-dynamic = ["version"]
+[project.optional-dependencies]
+packages = ["kopf==1.38.0"]
+pip-install = ["pip==25.2"]
 
 [project.urls]
 Documentation = "https://github.com/fortra/function-pythonic#readme"