Skip to content

Declare resources for the new admin-rke2 cluster

Vincent Sellier requested to merge mr/admin-rke2 into staging

Related to swh/infra/sysadm-environment#4730 (closed)

octocalogdiff 
diff origin/production/thanos.internal.admin.swh.network current/thanos.internal.admin.swh.network
*******************************************
+ Concat::Fragment[k8s-admin-rke2-thanos.internal.admin.swh.network:443] =>
   parameters =>
     "content": "  - k8s-admin-rke2-thanos.internal.admin.swh.network:443\n",
     "order": 1,
     "tag": "thanos",
     "target": "/etc/thanos/query-sd.yaml"
*******************************************
+ Concat_fragment[k8s-admin-rke2-thanos.internal.admin.swh.network:443] =>
   parameters =>
     "content": "  - k8s-admin-rke2-thanos.internal.admin.swh.network:443\n",
     "order": 1,
     "tag": "_etc_thanos_query-sd.yaml",
     "target": "/etc/thanos/query-sd.yaml"
*******************************************
  File[/etc/ssl/certs/letsencrypt/thanos/fullchain.pem] =>
   parameters =>
     notify =>
      - ["Service[thanos-store@archive-production-rke2]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging-rke2]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@archive-production-rke2]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging-rke2]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin-rke2]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
*******************************************
  File[/etc/ssl/certs/letsencrypt/thanos/privkey.pem] =>
   parameters =>
     notify =>
      - ["Service[thanos-store@archive-production-rke2]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging-rke2]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@archive-production-rke2]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging-rke2]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin-rke2]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
*******************************************
+ File[/etc/systemd/system/thanos-compact@k8s-admin-rke2.service.d/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet (class profile::thanos::compact) - modificat...
     "ensure": "file",
     "group": "root",
     "mode": "0444",
     "notify": [
       "Class[Systemd::Systemctl::Daemon_reload]"
     ],
     "owner": "root",
     "selinux_ignore_defaults": false,
     "show_diff": true
*******************************************
+ File[/etc/systemd/system/thanos-compact@k8s-admin-rke2.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/systemd/system/thanos-store@k8s-admin-rke2.service.d/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet (class profile::thanos::store) - modificatio...
     "ensure": "file",
     "group": "root",
     "mode": "0444",
     "notify": [
       "Class[Systemd::Systemctl::Daemon_reload]"
     ],
     "owner": "root",
     "selinux_ignore_defaults": false,
     "show_diff": true
*******************************************
+ File[/etc/systemd/system/thanos-store@k8s-admin-rke2.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/thanos/objstore-k8s-admin-rke2.yml] =>
   parameters =>
     "content": "# File managed by puppet - modifications will be lost\ntype: AZU...
     "ensure": "present",
     "group": "prometheus",
     "mode": "0640",
     "notify": [
       "Service[thanos-compact@k8s-admin-rke2]",
       "Service[thanos-store@k8s-admin-rke2]"
     ],
     "owner": "root"
*******************************************
  File[/opt/thanos/current] =>
   parameters =>
     notify =>
      - ["Service[thanos-compact@archive-production-rke2]", "Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging-rke2]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@k8s-admin]", "Service[thanos-compact@k8s-gitlab-production]", "Service[thanos-compact@k8s-gitlab-staging]", "Service[thanos-compact@k8s-rancher]", "Service[thanos-compact@mmca]", "Service[thanos-query]", "Service[thanos-store@archive-production-rke2]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging-rke2]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-compact@archive-production-rke2]", "Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging-rke2]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@k8s-admin-rke2]", "Service[thanos-compact@k8s-admin]", "Service[thanos-compact@k8s-gitlab-production]", "Service[thanos-compact@k8s-gitlab-staging]", "Service[thanos-compact@k8s-rancher]", "Service[thanos-compact@mmca]", "Service[thanos-query]", "Service[thanos-store@archive-production-rke2]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging-rke2]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin-rke2]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-compact-thanos.internal.admin.swh.network:19303] =>
   parameters =>
     "job": "thanos_compact",
     "labels": {
       "dataset_name": "k8s-admin-rke2"
     },
     "scrape_interval": "1m",
     "scrape_timeout": "45s",
     "target": "thanos.internal.admin.swh.network:19303"
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-store-thanos.internal.admin.swh.network:19203] =>
   parameters =>
     "job": "thanos_store",
     "labels": {
       "dataset_name": "k8s-admin-rke2"
     },
     "scrape_interval": "1m",
     "scrape_timeout": "45s",
     "target": "thanos.internal.admin.swh.network:19203"
*******************************************
+ Profile::Thanos::Export_query_endpoint[thanos-store-thanos.internal.admin.swh.network:19103] =>
   parameters =>
     "grpc_address": "thanos.internal.admin.swh.network:19103"
*******************************************
+ Service[thanos-compact@k8s-admin-rke2] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": [
       "thanos",
       "thanos-compact",
       "thanos-objstore-k8s-admin-rke2"
     ]
*******************************************
+ Service[thanos-store@k8s-admin-rke2] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": [
       "thanos",
       "thanos-objstore-k8s-admin-rke2",
       "thanos-store"
     ]
*******************************************
+ Systemd::Dropin_file[thanos-compact@k8s-admin-rke2/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet (class profile::thanos::compact) - modificat...
     "daemon_reload": "lazy",
     "ensure": "present",
     "filename": "parameters.conf",
     "group": "root",
     "mode": "0444",
     "notify": "Service[thanos-compact@k8s-admin-rke2]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-compact@k8s-admin-rke2.service"
*******************************************
+ Systemd::Dropin_file[thanos-store@k8s-admin-rke2/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet (class profile::thanos::store) - modificatio...
     "daemon_reload": "lazy",
     "ensure": "present",
     "filename": "parameters.conf",
     "group": "root",
     "mode": "0444",
     "notify": "Service[thanos-store@k8s-admin-rke2]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-store@k8s-admin-rke2.service"
*******************************************
  Systemd::Unit_file[thanos-compact@.service] =>
   parameters =>
     notify =>
      - ["Service[thanos-compact@archive-production-rke2]", "Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging-rke2]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@k8s-admin]", "Service[thanos-compact@k8s-gitlab-production]", "Service[thanos-compact@k8s-gitlab-staging]", "Service[thanos-compact@k8s-rancher]", "Service[thanos-compact@mmca]"]
      + ["Service[thanos-compact@archive-production-rke2]", "Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging-rke2]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@k8s-admin-rke2]", "Service[thanos-compact@k8s-admin]", "Service[thanos-compact@k8s-gitlab-production]", "Service[thanos-compact@k8s-gitlab-staging]", "Service[thanos-compact@k8s-rancher]", "Service[thanos-compact@mmca]"]
*******************************************
  Systemd::Unit_file[thanos-store@.service] =>
   parameters =>
     notify =>
      - ["Service[thanos-store@archive-production-rke2]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging-rke2]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@archive-production-rke2]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging-rke2]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin-rke2]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
*******************************************
*** End octocatalog-diff on thanos.internal.admin.swh.network
*** Running octocatalog-diff on host pergamon.softwareheritage.org
I, [2023-08-24T16:01:32.720996 #685347]  INFO -- : Catalogs compiled for pergamon.softwareheritage.org
W, [2023-08-24T16:01:34.817877 #685347]  WARN -- : Resource File[/tmp/ocd-ipc-20230824-685347-1v81wk/ocd-builddir-20230824-685352-dzleyh/routes.yaml] appears to depend on catalog compilation directory. Suppressed from results.
W, [2023-08-24T16:01:34.818052 #685347]  WARN -- : Resource File[/tmp/ocd-ipc-20230824-685347-1v81wk/ocd-builddir-20230824-685351-1vy4gwr/routes.yaml] appears to depend on catalog compilation directory. Suppressed from results.
W, [2023-08-24T16:01:34.818273 #685347]  WARN -- : Resource key Ini_setting[puppetdbserver_urls] parameters => path may depend on catalog compilation directory, but there may be differences. This is included in results for now, but please verify.
W, [2023-08-24T16:01:34.818294 #685347]  WARN -- : Resource key Ini_setting[puppetdbserver_urls] parameters => path appears to depend on catalog compilation directory. Suppressed from results.
W, [2023-08-24T16:01:34.818343 #685347]  WARN -- : Resource key Ini_setting[soft_write_failure] parameters => path may depend on catalog compilation directory, but there may be differences. This is included in results for now, but please verify.
W, [2023-08-24T16:01:34.818361 #685347]  WARN -- : Resource key Ini_setting[soft_write_failure] parameters => path appears to depend on catalog compilation directory. Suppressed from results.
I, [2023-08-24T16:01:34.818551 #685347]  INFO -- : Diffs computed for pergamon.softwareheritage.org
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
  File[/etc/bind/keys/local-update] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key local-update {
        algorithm hmac-sha256;
      - secret "mcvbuyqWvUuY+l290BpVwlggw7V9pDuHYapzhVP1uC7xksK7LIIgx8WeGhfebXFl2nOpGNUcNE7vxv7jGKWaQw==";
      + secret "bn697w1ve8FluHSyohE3hv4eI1PqnqYo+abGOIf4lgoYMYVvx3YpviMcRcx9i8iiaHwrKmvVMDCpNuFaeRl36w==";
       };
*******************************************
  File[/etc/bind/rndc.key] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key rndc-key {
        algorithm hmac-md5;
      - secret "x31MqjUGL8vYp0uq/QBYFE9vgQheKzx+QpZovvsstJrKFTefGPmzP4+lWBdHzPSwJEZ84/8qztX9QHkiyOB18g==";
      + secret "MD8YCtFf0Ek0yUAQfZ5vVxSRAUPsgDFXW7aBdCtJ1TUqHvBLj69TLSP9oQW935A6a7BwCSkIW7273miQCmXunw==";
       };
*******************************************
+ Resource_record[k8s-admin-rke2-thanos/CNAME] =>
   parameters =>
     "data": "k8s-admin-rke2.internal.admin.swh.network.",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "k8s-admin-rke2-thanos.internal.admin.swh.network",
     "type": "CNAME"
*******************************************
+ Resource_record[k8s-admin-rke2/A+PTR] =>
   parameters =>
     "data": "k8s-admin-rke2.internal.admin.swh.network.",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "139.50.168.192.in-addr.arpa",
     "type": "PTR"
*******************************************
+ Resource_record[k8s-admin-rke2/A] =>
   parameters =>
     "data": "192.168.50.139",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "k8s-admin-rke2.internal.admin.swh.network",
     "type": "A"
*******************************************
- Resource_record[k8s-argocd/A+PTR]
*******************************************
- Resource_record[k8s-argocd/A]
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

Merge request reports