Skip to content
Snippets Groups Projects

Draft: Add install profile in CRD

Closed Draft: Add install profile in CRD
add-profile-in-crd into master
5 unresolved threads
Closed Dimitra Chatzichrysou requested to merge add-profile-in-crd into master
5 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
api/v1alpha1/drupalsite_types.go
23 23 )
24 24
25 25 const (
26 QoSStandard QoSClass = "standard"
27 QoSCritical QoSClass = "critical"
28 QoSTest QoSClass = "test"
29 DBODStandard DatabaseClass = "standard"
30 DBODCritical DatabaseClass = "critical"
31 DBODSSD DatabaseClass = "ssd"
26 QoSStandard QoSClass = "standard"
27 QoSCritical QoSClass = "critical"
28 QoSTest QoSClass = "test"
29 DBODStandard DatabaseClass = "standard"
30 DBODCritical DatabaseClass = "critical"
31 DBODSSD DatabaseClass = "ssd"
32 InstallProfileBlank InstallProfile = "cern"
  • Konstantinos Samaras-Tsakiris
    Konstantinos Samaras-Tsakiris @kosamara started a thread on the diff
    • api/v1alpha1/drupalsite_types.go
    102 104 // Changing this field updates the password.
    103 105 // +optional
    104 106 WebDAVPassword string `json:"webDAVPassword,omitempty"`
    107
    108 // InstallProfile specifies the site configuration that integrates it with the CERN environment.
    109 // +kubebuilder:validation:Enum:=cern;easystart
  • Konstantinos Samaras-Tsakiris
    Konstantinos Samaras-Tsakiris @kosamara started a thread on the diff
    • api/v1alpha1/drupalsite_types.go
    117 123 // +kubebuilder:validation:Pattern=`[(http(s)?):\/\/(www\.)?a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)`
    118 124 type Url string
    119 125
    126 // InsrallProfile specifies the CERN profile that will be installed.
    127 type InstallProfile string
    • Konstantinos Samaras-Tsakiris
      Konstantinos Samaras-Tsakiris @kosamara ·
      Contributor

      What are you trying to achieve by declaring this type? The enum pattern? Then the CRD field in L110 should also be of this type; if it's a generic string, it can be anything.

      The syntax for that should be InstallProfile json:"installProfile,omitempty"` (omitting the field name). Golang "embeds" the field in this case, ie uses the type name as field name.

    • Please register or sign in to reply
  • Konstantinos Samaras-Tsakiris
    Konstantinos Samaras-Tsakiris @kosamara started a thread on the diff
    • controllers/drupalsite_controller_test.go
    87 87 ReleaseSpec: "stable",
    88 88 },
    89 89 Configuration: drupalwebservicesv1alpha1.Configuration{
    90 DiskSize: "10Gi",
    91 QoSClass: drupalwebservicesv1alpha1.QoSStandard,
    92 DatabaseClass: drupalwebservicesv1alpha1.DBODStandard,
    90 DiskSize: "10Gi",
    91 QoSClass: drupalwebservicesv1alpha1.QoSStandard,
    92 DatabaseClass: drupalwebservicesv1alpha1.DBODStandard,
    93 InstallProfile: string(drupalwebservicesv1alpha1.InstallProfileBlank),
  • Konstantinos Samaras-Tsakiris
    Konstantinos Samaras-Tsakiris @kosamara started a thread on the diff
    • controllers/drupalsite_resources.go
    1369 1369 Image: sitebuilderImageRefToUse(d, releaseID(d)).Name,
    1370 1370 Name: "drush",
    1371 1371 ImagePullPolicy: "Always",
    1372 Command: siteInstallJobForDrupalSite(),
    1372 Command: siteInstallJobForDrupalSite(d.Spec.InstallProfile),
  • Konstantinos Samaras-Tsakiris marked this merge request as draft

    marked this merge request as draft

  • Konstantinos Samaras-Tsakiris
    Konstantinos Samaras-Tsakiris @kosamara ·
    Contributor

    We might still want this, but the implementation will change when we revise webservices/webframeworks-planning#459

  • Dimitra Chatzichrysou closed

    closed

    • Please register or sign in to reply