Merge pull request #4 from codemowers/feat/ingress-mixin

feat: IngressMixin

Author: Erki Aas

operatorlib.py

@@ -614,6 +614,13 @@ async def reconcile_instance(self):
                     manifest["metadata"]["namespace"],
                     manifest,
                     _preload_content=False)
+                status = await resp.json()
+                if status["kind"] == "Status" and status["status"] == "Failure":
+                    print("  Failed to create %s %s/%s",
+                          manifest["kind"],
+                          manifest["metadata"]["namespace"],
+                          manifest["metadata"]["name"],
+                          "because:", status["message"])
             else:
                 print("  Patching %s %s/%s" % (manifest["kind"], manifest["metadata"]["namespace"], manifest["metadata"]["name"]))
                 resp = await getattr(k8s_api, "patch_namespaced_{0}".format(kind))(
@@ -1577,6 +1584,62 @@ def generate_manifests(self):
         }] if self.class_spec.get("podSpec") else [])
 
 
+class IngressMixin():
+    """
+    Mixin for handling Ingress resource
+    """
+    @classmethod
+    def generate_operator_cluster_role_rules(cls):
+        yield from super().generate_operator_cluster_role_rules()
+        yield "networking.k8s.io", "ingresses", ("get", "create", "patch")
+
+    def get_ingress_host(self):
+        return self.class_spec.get("ingressSpec").get("host") % (self.get_target_name())
+
+    def generate_ingress(self):
+        """
+        Generate Kubernetes Ingress specification
+        """
+        return {
+            "rules": [
+                {
+                    "host": self.get_ingress_host(),
+                    "http": {
+                        "paths": [
+                            {
+                                "pathType": "Prefix",
+                                "path": "/",
+                                "backend": {
+                                    "service": {
+                                        "name": self.get_service_name(),
+                                        "port": {
+                                            "name": "http"
+                                        }
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            ],
+            "tls": self.class_spec.get("ingressSpec").get("tls") if self.class_spec.get("ingressSpec").get("tls") else []
+        }
+
+    def generate_manifests(self):
+        return super().generate_manifests() + ([{
+            "kind": "Ingress",
+            "apiVersion": "networking.k8s.io/v1",
+            "metadata": {
+                "namespace": self.get_target_namespace(),
+                "name": self.get_service_name(),
+                "labels": self.labels,
+                "annotations": self.class_spec.get("ingressSpec").get("annotations") if self.class_spec.get("ingressSpec").get("annotations") else {},
+                "ownerReferences": [self.get_instance_owner()],
+            },
+            "spec": self.generate_ingress(),
+        }] if self.class_spec.get("ingressSpec") else [])
+
+
 class PrimarySecondaryMixin():
     """
     Mixin for handling primary-secondary applications

samples/minio-bucket-operator/Dockerfile

@@ -14,7 +14,7 @@ LABEL name="codemowers/minio-operator" \
       version="rc" \
       maintainer="Lauri Võsandi <[email protected]>"
 ENV PYTHONUNBUFFERED=1
-ENTRYPOINT /app/minio_bucket_operator.py run
+ENTRYPOINT python3 /app/minio_bucket_operator.py run
 ADD operatorlib.py /app/
 ADD samples/minio-bucket-operator/minio-owner.json /app/
 ADD samples/minio-bucket-operator/minio_bucket_operator.py /app/

samples/minio-bucket-operator/minio_bucket_operator.py

@@ -22,6 +22,7 @@
     ConsoleMixin, \
     HeadlessMixin, \
     ServiceMixin, \
+    IngressMixin, \
     InstanceSecretMixin, \
     ClaimSecretMixin, \
     ClassedOperator
@@ -42,6 +43,7 @@ class MinioBucketOperator(SharedMixin,
                           ConsoleMixin,
                           HeadlessMixin,
                           ServiceMixin,
+                          IngressMixin,
                           InstanceSecretMixin,
                           ClaimSecretMixin,
                           ClassedOperator):
@@ -109,7 +111,7 @@ def get_bucket_name(self):
         return "%s-%s" % (self.spec["claimRef"]["namespace"], self.uid)
 
     def get_s3_endpoint_url(self):
-        return self.instance_secret.get(
+        return "https://%s" % self.get_ingress_host() if self.class_spec.get("ingressSpec") else self.instance_secret.get(
             "AWS_S3_ENDPOINT_URL", "http://%s" % self.get_service_fqdn())
 
     def get_minio_admin_uri(self):

samples/minio-bucket-operator/templates/minio-bucket-operator-crds.yaml

@@ -246,6 +246,31 @@ spec:
                         type: object
                       type: array
                   type: object
+                ingressSpec:
+                  properties:
+                    host:
+                      type: string
+                    ingressClassName:
+                      type: string
+                    annotations:
+                      type: object
+                      x-kubernetes-embedded-resource: false
+                      x-kubernetes-preserve-unknown-fields: true
+                    tls:
+                      items:
+                        properties:
+                          hosts:
+                            type: array
+                            items:
+                              default: ""
+                              type: string
+                          secretName:
+                            type: string
+                        type: object
+                      type: array
+                  required:
+                    - host
+                  type: object
                 reclaimPolicy:
                   enum:
                     - Retain

samples/minio-bucket-operator/templates/minio-bucket-operator-rbac.yaml

@@ -27,6 +27,14 @@ rules:
       - create
       - get
       - patch
+  - apiGroups:
+      - networking.k8s.io
+    resources:
+      - ingresses
+    verbs:
+      - create
+      - get
+      - patch
   - apiGroups:
       - apps
     resources: