Merge pull request #131 from gmfrasca/deploy-on-osd

Deploy ODH manifest dependent on platform (OSD vs Internal Clusters)
red-hat-data-services · Jul 30, 2021 · 85b620b · 85b620b
2 parents c0cdfa2 + bdeb449
commit 85b620b
Show file tree

Hide file tree

Showing 19 changed files with 739 additions and 65 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,6 +20,7 @@ RUN tar -C /usr/local/bin -xvf $TMPDIR/oc.tar.gz && \
 
 COPY deploy.sh $HOME
 COPY opendatahub.yaml $HOME
+COPY opendatahub-osd.yaml $HOME
 COPY rhods-monitoring.yaml $HOME
 COPY rhods-notebooks.yaml $HOME
 ADD monitoring $HOME/monitoring
@@ -28,15 +29,18 @@ ADD groups $HOME/groups
 ADD jupyterhub $HOME/jupyterhub
 ADD partners $HOME/partners
 ADD network $HOME/network
+ADD cloud-resource-operator $HOME/cloud-resource-operator
 
 RUN chmod 755 $HOME/deploy.sh && \
     chmod 644 $HOME/opendatahub.yaml && \
+    chmod 644 $HOME/opendatahub-osd.yaml && \
     chmod 644 $HOME/rhods-monitoring.yaml && \
     chmod 644 $HOME/rhods-notebooks.yaml && \
     chmod 644 -R $HOME/monitoring && \
     chmod 644 -R $HOME/groups && \
     chmod 644 -R $HOME/jupyterhub && \
     chmod 644 -R $HOME/network && \
+    chmod 644 -R $HOME/cloud-resource-operator && \
     chown 1001:0 -R $HOME &&\
     chmod ug+rwx -R $HOME
 

diff --git a/README.md b/README.md
@@ -3,4 +3,5 @@ Deployment container for Open Data Hub
 
 This container is meant to be run alongside the opendatahub operator.
 It will create the ODH custom resource (KfDef) to trigger the
-installation of the components specified in opendatahub.yaml.
+installation of the components specified in opendatahub.yaml 
+(or opendatahub-osd.yaml if on OpenShift Dedicated)
diff --git a/cloud-resource-operator/crds/integreatly.org_blobstorages.yaml b/cloud-resource-operator/crds/integreatly.org_blobstorages.yaml
@@ -0,0 +1,85 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: blobstorages.integreatly.org
+spec:
+  group: integreatly.org
+  names:
+    kind: BlobStorage
+    listKind: BlobStorageList
+    plural: blobstorages
+    singular: blobstorage
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: BlobStorage is the Schema for the blobstorages API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              applyImmediately:
+                description: ApplyImmediately is only available to Postgres cr, for blobstorage and redis cr's currently does nothing
+                type: boolean
+              secretRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                type: object
+              skipCreate:
+                type: boolean
+              tier:
+                type: string
+              type:
+                type: string
+            required:
+            - secretRef
+            - tier
+            - type
+            type: object
+          status:
+            properties:
+              message:
+                type: string
+              phase:
+                type: string
+              provider:
+                type: string
+              secretRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                type: object
+              strategy:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/cloud-resource-operator/crds/integreatly.org_postgres.yaml b/cloud-resource-operator/crds/integreatly.org_postgres.yaml
@@ -0,0 +1,85 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: postgres.integreatly.org
+spec:
+  group: integreatly.org
+  names:
+    kind: Postgres
+    listKind: PostgresList
+    plural: postgres
+    singular: postgres
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Postgres is the Schema for the postgres API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              applyImmediately:
+                description: ApplyImmediately is only available to Postgres cr, for blobstorage and redis cr's currently does nothing
+                type: boolean
+              secretRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                type: object
+              skipCreate:
+                type: boolean
+              tier:
+                type: string
+              type:
+                type: string
+            required:
+            - secretRef
+            - tier
+            - type
+            type: object
+          status:
+            properties:
+              message:
+                type: string
+              phase:
+                type: string
+              provider:
+                type: string
+              secretRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                type: object
+              strategy:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/cloud-resource-operator/crds/integreatly.org_postgressnapshots.yaml b/cloud-resource-operator/crds/integreatly.org_postgressnapshots.yaml
@@ -0,0 +1,58 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: postgressnapshots.integreatly.org
+spec:
+  group: integreatly.org
+  names:
+    kind: PostgresSnapshot
+    listKind: PostgresSnapshotList
+    plural: postgressnapshots
+    singular: postgressnapshot
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: PostgresSnapshot is the Schema for the postgressnapshots API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: PostgresSnapshotSpec defines the desired state of PostgresSnapshot
+            properties:
+              resourceName:
+                description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file Add custom validation using kubebuilder tags: https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
+                type: string
+            required:
+            - resourceName
+            type: object
+          status:
+            properties:
+              message:
+                type: string
+              phase:
+                type: string
+              snapshotID:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/cloud-resource-operator/crds/integreatly.org_redis.yaml b/cloud-resource-operator/crds/integreatly.org_redis.yaml
@@ -0,0 +1,85 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: redis.integreatly.org
+spec:
+  group: integreatly.org
+  names:
+    kind: Redis
+    listKind: RedisList
+    plural: redis
+    singular: redis
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Redis is the Schema for the redis API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              applyImmediately:
+                description: ApplyImmediately is only available to Postgres cr, for blobstorage and redis cr's currently does nothing
+                type: boolean
+              secretRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                type: object
+              skipCreate:
+                type: boolean
+              tier:
+                type: string
+              type:
+                type: string
+            required:
+            - secretRef
+            - tier
+            - type
+            type: object
+          status:
+            properties:
+              message:
+                type: string
+              phase:
+                type: string
+              provider:
+                type: string
+              secretRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                type: object
+              strategy:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []