core: added License in SSO code

Added License header in sso code Signed-off-by: gauravsitlani <gauravsitlani@riseup.net>
koor-tech · Mar 1, 2023 · ea050b6 · ea050b6
1 parent 662b710
commit ea050b6
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 105 deletions.
diff --git a/deploy/examples/cluster.yaml b/deploy/examples/cluster.yaml
@@ -104,19 +104,25 @@ spec:
     # enable the Multus network provider
     #provider: multus
     #selectors:
-    # The selector keys are required to be `public` and `cluster`.
-    # Based on the configuration, the operator will do the following:
-    #   1. if only the `public` selector key is specified both public_network and cluster_network Ceph settings will listen on that interface
-    #   2. if both `public` and `cluster` selector keys are specified the first one will point to 'public_network' flag and the second one to 'cluster_network'
-    #
-    # In order to work, each selector value must match a NetworkAttachmentDefinition object in Multus
-    #
-    #public: public-conf --> NetworkAttachmentDefinition object name in Multus
-    #cluster: cluster-conf --> NetworkAttachmentDefinition object name in Multus
+      # The selector keys are required to be `public` and `cluster`.
+      # Based on the configuration, the operator will do the following:
+      #   1. if only the `public` selector key is specified both public_network and cluster_network Ceph settings will listen on that interface
+      #   2. if both `public` and `cluster` selector keys are specified the first one will point to 'public_network' flag and the second one to 'cluster_network'
+      #
+      # In order to work, each selector value must match a NetworkAttachmentDefinition object in Multus
+      #
+      #public: public-conf --> NetworkAttachmentDefinition object name in Multus
+      #cluster: cluster-conf --> NetworkAttachmentDefinition object name in Multus
     # Provide internet protocol version. IPv6, IPv4 or empty string are valid options. Empty string would mean IPv4
     #ipFamily: "IPv6"
     # Ceph daemons to listen on both IPv4 and Ipv6 networks
     #dualStack: false
+    # Enable multiClusterService to export the mon and OSD services to peer cluster.
+    # This is useful to support RBD mirroring between two clusters having overlapping CIDRs.
+    # Ensure that peer clusters are connected using an MCS API compatible application, like Globalnet Submariner.
+    #multiClusterService:
+    #  enabled: false
+
   # enable the crash collector for ceph daemon crash collection
   crashCollector:
     disable: false
@@ -155,75 +161,75 @@ spec:
   # To control where various services will be scheduled by kubernetes, use the placement configuration sections below.
   # The example under 'all' would have all services scheduled on kubernetes nodes labeled with 'role=storage-node' and
   # tolerate taints with a key of 'storage-node'.
-  #  placement:
-  #    all:
-  #      nodeAffinity:
-  #        requiredDuringSchedulingIgnoredDuringExecution:
-  #          nodeSelectorTerms:
-  #          - matchExpressions:
-  #            - key: role
-  #              operator: In
-  #              values:
-  #              - storage-node
-  #      podAffinity:
-  #      podAntiAffinity:
-  #      topologySpreadConstraints:
-  #      tolerations:
-  #      - key: storage-node
-  #        operator: Exists
-  # The above placement information can also be specified for mon, osd, and mgr components
-  #    mon:
-  # Monitor deployments may contain an anti-affinity rule for avoiding monitor
-  # collocation on the same node. This is a required rule when host network is used
-  # or when AllowMultiplePerNode is false. Otherwise this anti-affinity rule is a
-  # preferred rule with weight: 50.
-  #    osd:
-  #    prepareosd:
-  #    mgr:
-  #    cleanup:
+#  placement:
+#    all:
+#      nodeAffinity:
+#        requiredDuringSchedulingIgnoredDuringExecution:
+#          nodeSelectorTerms:
+#          - matchExpressions:
+#            - key: role
+#              operator: In
+#              values:
+#              - storage-node
+#      podAffinity:
+#      podAntiAffinity:
+#      topologySpreadConstraints:
+#      tolerations:
+#      - key: storage-node
+#        operator: Exists
+# The above placement information can also be specified for mon, osd, and mgr components
+#    mon:
+# Monitor deployments may contain an anti-affinity rule for avoiding monitor
+# collocation on the same node. This is a required rule when host network is used
+# or when AllowMultiplePerNode is false. Otherwise this anti-affinity rule is a
+# preferred rule with weight: 50.
+#    osd:
+#    prepareosd:
+#    mgr:
+#    cleanup:
   annotations:
-  #    all:
-  #    mon:
-  #    osd:
-  #    cleanup:
-  #    prepareosd:
-  # clusterMetadata annotations will be applied to only `rook-ceph-mon-endpoints` configmap and the `rook-ceph-mon` and `rook-ceph-admin-keyring` secrets.
-  # And clusterMetadata annotations will not be merged with `all` annotations.
-  #    clusterMetadata:
-  #       kubed.appscode.com/sync: "true"
-  # If no mgr annotations are set, prometheus scrape annotations will be set by default.
-  #    mgr:
+#    all:
+#    mon:
+#    osd:
+#    cleanup:
+#    prepareosd:
+# clusterMetadata annotations will be applied to only `rook-ceph-mon-endpoints` configmap and the `rook-ceph-mon` and `rook-ceph-admin-keyring` secrets.
+# And clusterMetadata annotations will not be merged with `all` annotations.
+#    clusterMetadata:
+#       kubed.appscode.com/sync: "true"
+# If no mgr annotations are set, prometheus scrape annotations will be set by default.
+#    mgr:
   labels:
-  #    all:
-  #    mon:
-  #    osd:
-  #    cleanup:
-  #    mgr:
-  #    prepareosd:
-  # monitoring is a list of key-value pairs. It is injected into all the monitoring resources created by operator.
-  # These labels can be passed as LabelSelector to Prometheus
-  #    monitoring:
-  #    crashcollector:
+#    all:
+#    mon:
+#    osd:
+#    cleanup:
+#    mgr:
+#    prepareosd:
+# monitoring is a list of key-value pairs. It is injected into all the monitoring resources created by operator.
+# These labels can be passed as LabelSelector to Prometheus
+#    monitoring:
+#    crashcollector:
   resources:
-  # The requests and limits set here, allow the mgr pod to use half of one CPU core and 1 gigabyte of memory
-  #    mgr:
-  #      limits:
-  #        cpu: "500m"
-  #        memory: "1024Mi"
-  #      requests:
-  #        cpu: "500m"
-  #        memory: "1024Mi"
-  # The above example requests/limits can also be added to the other components
-  #    mon:
-  #    osd:
-  # For OSD it also is a possible to specify requests/limits based on device class
-  #    osd-hdd:
-  #    osd-ssd:
-  #    osd-nvme:
-  #    prepareosd:
-  #    crashcollector:
-  #    logcollector:
-  #    cleanup:
+# The requests and limits set here, allow the mgr pod to use half of one CPU core and 1 gigabyte of memory
+#    mgr:
+#      limits:
+#        cpu: "500m"
+#        memory: "1024Mi"
+#      requests:
+#        cpu: "500m"
+#        memory: "1024Mi"
+# The above example requests/limits can also be added to the other components
+#    mon:
+#    osd:
+# For OSD it also is a possible to specify requests/limits based on device class
+#    osd-hdd:
+#    osd-ssd:
+#    osd-nvme:
+#    prepareosd:
+#    crashcollector:
+#    logcollector:
+#    cleanup:
   # The option to automatically remove OSDs that are out and are safe to destroy.
   removeOSDsIfOutAndSafeToRemove: false
   priorityClassNames:
@@ -243,8 +249,8 @@ spec:
       # journalSizeMB: "1024"  # uncomment if the disks are 20 GB or smaller
       # osdsPerDevice: "1" # this value can be overridden at the node or device level
       # encryptedDevice: "true" # the default value for this option is "false"
-    # Individual nodes and their config can be specified as well, but 'useAllNodes' above must be set to false. Then, only the named
-    # nodes below will be used as storage resources.  Each node's 'name' field should match their 'kubernetes.io/hostname' label.
+# Individual nodes and their config can be specified as well, but 'useAllNodes' above must be set to false. Then, only the named
+# nodes below will be used as storage resources.  Each node's 'name' field should match their 'kubernetes.io/hostname' label.
     # nodes:
     #   - name: "172.17.4.201"
     #     devices: # specific devices to use for storage can be specified for each node

diff --git a/design/ceph/ceph-dashboard-sso.md b/design/ceph/ceph-dashboard-sso.md
@@ -51,7 +51,8 @@ spec:
            - <role>
       baseUrl: <url_value>
       idpMetadataUrl: <url_value>
-      idpUsernameAttribute: "username"
+      idpAttributes:
+        username: <uid>
       entityID: <entity_id_value>
       spCert:
         key: tls.crt

diff --git a/pkg/operator/ceph/cluster/mgr/dashboard_sso.go b/pkg/operator/ceph/cluster/mgr/dashboard_sso.go
@@ -1,19 +1,6 @@
 /*
-Copyright 2018 The Rook Authors. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Copyright (c) 2023 Koor Technolgies, Inc.
 */
-
 // Package mgr for the Ceph manager.
 package mgr
 

diff --git a/pkg/operator/ceph/cluster/mgr/dashboard_sso_test.go b/pkg/operator/ceph/cluster/mgr/dashboard_sso_test.go
@@ -1,17 +1,5 @@
 /*
-Copyright 2018 The Rook Authors. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Copyright (c) 2023 Koor Technolgies, Inc.
 */
 package mgr