Merge branch 'master' into 333-update-nextcloud-onlyoffice-version

.gitlab-ci.yml

@@ -35,10 +35,16 @@ bootstrap:
   script:
     - echo "hostname $HOSTNAME, subdomain $SUBDOMAIN, domain $DOMAIN, address $ADDRESS"
     - python3 -m openappstack $HOSTNAME create --create-droplet $DOMAIN --hostname $HOSTNAME --ssh-key-id $SSH_KEY_ID --create-domain-records --subdomain $SUBDOMAIN
+    # Allows ansible debugging early in the beginning
+    - chmod 700 ansible
+    - cp clusters/ci-${CI_PIPELINE_ID}/inventory.yml ansible/
+    - cp clusters/ci-${CI_PIPELINE_ID}/settings.yml ansible/group_vars/all/
     - python3 -m openappstack $HOSTNAME install --ansible-param='--skip-tags=helmfile'
   artifacts:
     paths:
     - ./clusters
+    - ansible/inventory.yml
+    - ansible/group_vars/all/settings.yml
     expire_in: 1 month
     when: always
   only:
@@ -55,10 +61,14 @@ install:
   script:
     - python3 -m openappstack $HOSTNAME install --ansible-param='--tags=helmfile'
     # Show versions of installed apps/binaries
+    - chmod 700 ansible
+    - cd ansible
     - ansible master -m shell -a 'oas-version-info.sh 2>&1'
   artifacts:
     paths:
     - ./clusters
+    - ansible/inventory.yml
+    - ansible/group_vars/all/settings.yml
     expire_in: 1 month
     when: always
   only:

.gitlab/ci_templates/kaniko.yml

@@ -8,6 +8,10 @@
 #
 # - KANIKO_CONTEXT: The subdir which holds the Dockerfile, leave unset if
 #                   the Dockerfile is located at root level of the project.
+#
+# - KANIKO_ADDITIONAL_ARGS: This variable allows you to pass in ARG values that
+#   are used at build time. Similarly to Docker you can specify multiple arguments
+#   using the format `--build-arg NAME=VALUE` as many times as you need.
 .kaniko_build:
   stage: build
   image:
@@ -18,4 +22,4 @@
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - if [ -n "${KANIKO_BUILD_IMAGENAME}" ]; then  export IMAGENAME="/${KANIKO_BUILD_IMAGENAME}"; fi
-    - /kaniko/executor --context ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.} --dockerfile ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.}/Dockerfile --destination ${CI_REGISTRY_IMAGE}${IMAGENAME}:${CI_COMMIT_REF_NAME}
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.} --dockerfile ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.}/Dockerfile --destination ${CI_REGISTRY_IMAGE}${IMAGENAME}:${CI_COMMIT_REF_NAME} ${KANIKO_ADDITIONAL_ARGS}

ansible/group_vars/all/oas.yml

@@ -60,3 +60,6 @@ cert_manager:
   # the helm chart. See https://hub.helm.sh/charts/jetstack/cert-manager for
   # details
   crd_version: '0.9'
+
+prometheus:
+  crd_version: 'v0.34.0'

ansible/roles/apps/tasks/prometheus.yml

@@ -4,8 +4,7 @@
   tags:
     - helmfile
     - prometheus
-  # NOTE: Change the commit hash in the URL when upgrading Prometheus
-  command: '/snap/bin/kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/v0.31.1/example/prometheus-operator-crd/{{ item }}'
+  command: '/snap/bin/kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/{{ prometheus.crd_version }}/example/prometheus-operator-crd/{{ item }}'
   loop:
     - alertmanager.crd.yaml
     - prometheus.crd.yaml
@@ -32,7 +31,7 @@
     recurse: true
   when: prometheus_pv_name.stdout
 
-- name: Install prometheus and graphana
+- name: Install prometheus and grafana
   include_role:
     name: "helmfile"
     tasks_from: "apply"
@@ -43,7 +42,7 @@
       environment:
         - GRAFANA_ADMIN_PASSWORD: "{{ grafana_admin_password }}"
   tags:
-    - monitoring
+    - helmfile
     - prometheus
   vars:
       helmfile: '15-monitoring'

helmfiles/helmfile.d/15-monitoring.yaml

@@ -7,9 +7,9 @@ releases:
   - name: "oas-{{ .Environment.Values.releaseName }}-prometheus"
     namespace: "oas"
     chart: "stable/prometheus-operator"
-    # NOTE: If you change this version, also change the commit hash in
-    # ansible/roles/apps/tasks/helmfiles.yml:34
-    version: 5.15.0
+    # NOTE: If you change this version, also update the crd_version number in
+    # ansible/group_vars/all/oas.yml
+    version: "7.4.0"
     values:
     - "../values/prometheus.yaml.gotmpl"
     - "/etc/OpenAppStack/values/apps/prometheus.yaml.gotmpl"

helmfiles/values/nextcloud.yaml.gotmpl

 nextcloud:
+  # Set this to true to debug your nextcloud
+  debug: false
+
   nextcloud:
     host: "files.{{ .Environment.Values.domain }}"
     password: "{{ requiredEnv "NEXTCLOUD_PASSWORD" }}"

helmfiles/values/prometheus.yaml.gotmpl

@@ -5,6 +5,20 @@ coreDns:
 kubeDns:
   enabled: false
 
+kubeControllerManager:
+  enabled: false
+  # If you enable this, you need the following selector:
+  service:
+    selector:
+      k8s-app: kube-controller-manager
+
+kubeScheduler:
+  enabled: false
+  # If you enable this, you need the following selector:
+  service:
+    selector:
+      k8s-app: kube-scheduler
+
 alertmanager:
   alertmanagerSpec:
     logFormat: logfmt

test/behave/features/grafana.feature

@@ -5,12 +5,12 @@ Feature: Test grafana admin login
 
 Scenario: Open grafana
   When I open the grafana URL
-  Then I wait on element "//input[@name='username']" for 25000ms to be visible
+  Then I wait on element "//input[@name='user']" for 25000ms to be visible
   And I expect that element "#inputPassword" is visible
 
 Scenario: Login to grafana
-  Given the element "//input[@name='username']" is visible
-  When I enter the "grafana" "username" in the inputfield "//input[@name='username']"
+  Given the element "//input[@name='user']" is visible
+  When I enter the "grafana" "username" in the inputfield "//input[@name='user']"
   And I enter the "grafana" "password" in the inputfield "#inputPassword"
   And I click on the button "//div[@id='login-view']//button[@type='submit']"
   Then I wait on element "/html/body/grafana-app/sidemenu/a" for 25000ms to be visible