Merge branch 'webdav-image' into 'master'

Add webdav and phpExporter image to chart values

See merge request drupal/paas/drupalsite-operator!114

Author: Oblynx

chart/drupalsite-operator/templates/manager-deploy.yaml

@@ -24,6 +24,8 @@ spec:
       - args:
         - --leader-elect
         - --sitebuilder-image={{.Values.drupalsiteOperator.sitebuilderImage}}
+        - --php-fpm-exporter-image={{.Values.drupalsiteOperator.phpFpmExporterImage}}
+        - --webdav-image={{.Values.drupalsiteOperator.webdavImage}}
         - --zap-stacktrace-level={{.Values.drupalsiteOperator.logStacktraceLevel}}
         - --zap-log-level={{.Values.drupalsiteOperator.logLevel}}
         - --default-release-spec={{.Values.drupalsiteOperator.defaultReleaseSpec}}

chart/drupalsite-operator/values.yaml

@@ -17,6 +17,8 @@ resources:
 # Operator-specific configuration
 drupalsiteOperator:
   sitebuilderImage: "gitlab-registry.cern.ch/drupal/paas/cern-drupal-distribution/site-builder"
+  phpFpmExporterImage: "gitlab-registry.cern.ch/drupal/paas/php-fpm-prometheus-exporter:RELEASE.2021.06.02T09-41-38Z"
+  webdavImage: "gitlab-registry.cern.ch/drupal/paas/sabredav/webdav:RELEASE-2021.10.07T13-46-43Z"
   # Zap Level to configure the verbosity of logging. Can be one of 'debug', 'info', 'error', or any integer value > 0 which corresponds to custom debug levels of increasing verbosity
   logLevel: "3"
   # Zap Level at and above which stacktraces are captured (one of 'info', 'error')

main.go

@@ -73,10 +73,10 @@ func main() {
 			"Enabling this will ensure there is only one active controller manager.")
 	flag.StringVar(&controllers.SiteBuilderImage, "sitebuilder-image", "gitlab-registry.cern.ch/drupal/paas/cern-drupal-distribution/site-builder", "The sitebuilder source image name.")
 	flag.StringVar(&controllers.PhpFpmExporterImage, "php-fpm-exporter-image", "gitlab-registry.cern.ch/drupal/paas/php-fpm-prometheus-exporter:RELEASE.2021.06.02T09-41-38Z", "The php-fpm-exporter source image name.")
-	flag.StringVar(&controllers.WebDAVImage, "webdav-image", "gitlab-registry.cern.ch/drupal/paas/sabredav/webdav:RELEASE-2021.07.28T17-19-49Z", "The webdav source image name.")
+	flag.StringVar(&controllers.WebDAVImage, "webdav-image", "gitlab-registry.cern.ch/drupal/paas/sabredav/webdav:RELEASE-2021.10.07T13-46-43Z", "The webdav source image name.")
 	flag.StringVar(&controllers.SMTPHost, "smtp-host", "cernmx.cern.ch", "SMTP host used by Drupal server pods to send emails.")
 	flag.StringVar(&controllers.VeleroNamespace, "velero-namespace", "openshift-cern-drupal", "The namespace of the Velero server to create backups")
-	flag.StringVar(&controllers.DefaultReleaseSpec, "default-release-spec", "RELEASE-2021.09.13T09-24-02Z", "The default releaseSpec value to be passed to the DrupalSites")
+	flag.StringVar(&controllers.DefaultReleaseSpec, "default-release-spec", "RELEASE-2021.10.07T14-52-56Z", "The default releaseSpec value to be passed to the DrupalSites")
 	opts := zap.Options{
 		Development: false,
 	}