From c2365a8161c7c61c5078980a361b42c3030aa5cf Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Fri, 8 Mar 2024 13:58:03 -0500 Subject: [PATCH 1/5] feat: (IAC-1375) Edit Ingress Definitions for Alertmanager To Adapt Changes From Viya Monitoring (#531) --- .../templates/host-based/user-values-prom-operator.yaml | 6 ++++++ .../templates/path-based/user-values-prom-operator.yaml | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/roles/monitoring/templates/host-based/user-values-prom-operator.yaml b/roles/monitoring/templates/host-based/user-values-prom-operator.yaml index fa8e9d44..30297faf 100644 --- a/roles/monitoring/templates/host-based/user-values-prom-operator.yaml +++ b/roles/monitoring/templates/host-based/user-values-prom-operator.yaml @@ -17,6 +17,12 @@ prometheus: - {{ V4M_PROMETHEUS_FQDN }} prometheusSpec: externalUrl: "https://{{ V4M_PROMETHEUS_FQDN }}" + alertingEndpoints: + - name: v4m-alertmanager + port: http-web + scheme: https + tlsConfig: + insecureSkipVerify: true storageSpec: volumeClaimTemplate: spec: diff --git a/roles/monitoring/templates/path-based/user-values-prom-operator.yaml b/roles/monitoring/templates/path-based/user-values-prom-operator.yaml index 3f583b65..1b40f137 100644 --- a/roles/monitoring/templates/path-based/user-values-prom-operator.yaml +++ b/roles/monitoring/templates/path-based/user-values-prom-operator.yaml @@ -24,7 +24,7 @@ grafana: # Note that Prometheus and Alertmanager do not have any # authentication configured by default, exposing an -# unauthenticated applicaton without other restrictions +# unauthenticated application without other restrictions # in place is insecure. prometheus: @@ -49,6 +49,13 @@ prometheus: prometheusSpec: routePrefix: /prometheus externalUrl: "https://{{ V4M_BASE_DOMAIN }}/prometheus" + alertingEndpoints: + - name: v4m-alertmanager + port: http-web + pathPrefix: "/alertmanager" + scheme: https + tlsConfig: + insecureSkipVerify: true alertmanager: # Disable default configuration of NodePort From c21a417aafd1bc59f4d60b1b4983123e69d406a7 Mon Sep 17 00:00:00 2001 From: Ritika Patil <94649368+riragh@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:13:12 -0600 Subject: [PATCH 2/5] feat: (IAC-1236) Dependency version update (#530) --- Dockerfile | 8 ++++---- docs/user/Dependencies.md | 27 ++++++++++++++------------- requirements.txt | 10 +++++----- requirements.yaml | 6 +++--- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index a90f9225..e0836ca6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get upgrade -y \ && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 FROM baseline as tool_builder -ARG kubectl_version=1.27.9 +ARG kubectl_version=1.27.11 WORKDIR /build @@ -17,9 +17,9 @@ RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$kubect # Installation FROM baseline -ARG helm_version=3.14.0 -ARG aws_cli_version=2.13.33 -ARG gcp_cli_version=460.0.0-0 +ARG helm_version=3.14.2 +ARG aws_cli_version=2.15.22 +ARG gcp_cli_version=464.0.0 # Add extra packages RUN apt-get update && apt-get install --no-install-recommends -y gzip wget git jq ssh sshpass skopeo rsync \ diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 34915786..cfbf85a1 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -6,28 +6,29 @@ The following list details our dependencies and versions (~ indicates multiple p | SOURCE | NAME | VERSION | |----------------|------------------|-------------| -| ~ | python | >=3.10 | +| ~ | python | >=3.10 | | ~ | pip | 3.x | | ~ | unzip | any | | ~ | tar | any | -| ~ | docker | >=20.10.10 | +| ~ | docker | >=25.0.3 | | ~ | git | any | | ~ | rsync | any | | ~ | kubectl | 1.26 - 1.28 | -| ~ | Helm | 3.14.0 | -| pip3 | ansible | 9.1.0 | -| pip3 | openshift | 0.13.1 | -| pip3 | kubernetes | 26.1.0 | -| pip3 | dnspython | 2.3.0 | -| pip3 | docker | 5.0.3 | -| ansible-galaxy | community.docker | 2.7.8 | -| ansible-galaxy | ansible.utils | 2.3.0 | -| ansible-galaxy | kubernetes.core | 2.3.2 | +| ~ | Helm | 3.14.2 | +| pip3 | ansible | 9.2.0 | +| pip3 | openshift | 0.13.2 | +| pip3 | kubernetes | 27.2.0 | +| pip3 | dnspython | 2.6.1 | +| pip3 | docker | 7.0.0 | +| pip3 | urllib3 | 1.26.18 | +| ansible-galaxy | community.docker | 3.8.0 | +| ansible-galaxy | ansible.utils | 3.1.0 | +| ansible-galaxy | kubernetes.core | 3.0.1 | If you are using a provider based kubeconfig file created by viya4-iac-gcp:4.5.0 or newer, install these dependencies: | SOURCE | NAME | VERSION | |----------------|-------------------------|-------------| -| ~ | gcloud | 460.0.0 | +| ~ | gcloud | 464.0.0 | | ~ | gcloud-gke-auth-plugin | >= 0.5.2 | Required project dependencies are generally pinned to known working or stable versions to ensure users have a smooth initial experience. In some cases it may be required to change the default version of a dependency. In such cases users are welcome to experiment with alternate versions, however compatibility may not be guaranteed. @@ -48,7 +49,7 @@ As described in the [Docker Installation](./DockerUsage.md) section add addition ```bash # Override kubectl version docker build \ - --build-arg kubectl_version=1.27.9 \ + --build-arg kubectl_version=1.27.11 \ -t viya4-deployment . ``` diff --git a/requirements.txt b/requirements.txt index 6b618343..5b239b05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -ansible==9.1.0 # 8.6.0 # 2.10.7 -openshift==0.13.1 # 0.12.0 -kubernetes==26.1.0 # 12.0.1 -dnspython==2.3.0 # 2.1.0 -docker==5.0.3 +ansible==9.2.0 # 9.1.0 # 8.6.0 # 2.10.7 +openshift==0.13.2 # 0.13.1 # 0.12.0 +kubernetes==27.2.0 # 26.1.0 # 12.0.1 +dnspython==2.6.1 # 2.3.0 # 2.1.0 +docker==7.0.0 # 5.0.3 urllib3==1.26.18 diff --git a/requirements.yaml b/requirements.yaml index 66defdbe..c6a707bc 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -1,8 +1,8 @@ --- collections: - name: ansible.utils - version: 2.3.0 + version: 3.1.0 # 2.3.0 - name: community.docker - version: 2.7.8 + version: 3.8.0 # 2.7.8 - name: kubernetes.core - version: 2.3.2 + version: 3.0.0 # 2.3.2 From 608bf3c01483e17ed8391775e6e0d6aab57c4ce8 Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:43:28 -0400 Subject: [PATCH 3/5] docs: (IAC-1294) Add Note about sitedefault When Not Using Embedded LDAP (#532) Closes #485 --- docs/CONFIG-VARS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index d3bd4637..4cf9d909 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -351,7 +351,7 @@ Additional documentation for the SAS Workload Orchestrator Service can be found | Name | Description | Type | Default | Required | Notes | Tasks | | :--- | ---: | ---: | ---: | ---: | ---: | ---: | | V4_CFG_CLUSTER_NODE_POOL_MODE | The mode of cluster node pool to use | string | "standard" | false | [standard, minimal] | viya | -| V4_CFG_EMBEDDED_LDAP_ENABLE | Deploy OpenLDAP in the namespace for authentication | bool | false | false | [Openldap Config](../roles/vdm/templates/generators/openldap-bootstrap-config.yaml) | viya | +| V4_CFG_EMBEDDED_LDAP_ENABLE | Deploy OpenLDAP in the namespace for authentication | bool | false | false | [Openldap Config](../roles/vdm/templates/generators/openldap-bootstrap-config.yaml). If you do not set this value to true, you must set `V4_CFG_SITEDEFAULT` to point to a sitedefault file which contains values applicable for your authentication configuration. | viya | | V4_CFG_CONSUL_ENABLE_LOADBALANCER | Set up LoadBalancer to access the Consul user interface | bool | false | false | Consul UI port is 8500. | viya | | V4_CFG_ELASTICSEARCH_ENABLE | Enable search with Open Distro for ElasticSearch | bool | true | false | When deploying LTS earlier than 2020.1 or Stable earlier than 2020.1.2, set to false. | viya | | V4_CFG_VIYA_START_SCHEDULE | Configure your SAS Viya platform deployment to start on specific schedules | string | | false | This variable accepts [CronJob schedule expressions](https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#cron-schedule-syntax) to create your Viya start job schedule. See note below. | viya | From e6f882b9c85d9beb2517324e43b8269711744524 Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Wed, 13 Mar 2024 09:36:54 -0400 Subject: [PATCH 4/5] chore: (IAC-1342) Disable Blank GitHub Issues & Add Feature Request Template (#533) --- .github/ISSUE_TEMPLATE/config.yml | 1 + ...-bug-report.yaml => issue--bug-report.yml} | 0 .../ISSUE_TEMPLATE/issue--feature-request.yml | 44 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml rename .github/ISSUE_TEMPLATE/{issue--bug-report.yaml => issue--bug-report.yml} (100%) create mode 100644 .github/ISSUE_TEMPLATE/issue--feature-request.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..3ba13e0c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false diff --git a/.github/ISSUE_TEMPLATE/issue--bug-report.yaml b/.github/ISSUE_TEMPLATE/issue--bug-report.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/issue--bug-report.yaml rename to .github/ISSUE_TEMPLATE/issue--bug-report.yml diff --git a/.github/ISSUE_TEMPLATE/issue--feature-request.yml b/.github/ISSUE_TEMPLATE/issue--feature-request.yml new file mode 100644 index 00000000..c8810a8c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue--feature-request.yml @@ -0,0 +1,44 @@ +name: Feature Request +description: | + Welcome, Thanks for opening a feature request. The more information you provide, the easier it is for us to assess your request, prioritize, assign, develop, and release. The SAS Viya 4 IaC team. +labels: [enhancement, new] +body: + - type: textarea + id: problem + attributes: + label: Is your feature request related to a problem? Please describe. + description: | + A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + validations: + required: true + - type: textarea + id: solution + attributes: + label: Describe the solution you'd like + description: | + A clear and concise description of what you want to happen. + validations: + required: true + - type: textarea + id: alternatives + attributes: + label: Describe alternatives you've considered + description: | + A clear and concise description of any alternative solutions or features you've considered. + validations: + required: false + - type: textarea + id: additional + attributes: + label: Additional context + description: Add any other context or screenshots about the feature request here. + validations: + required: false + - type: checkboxes + id: tf_terms + attributes: + label: Code of Conduct + description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/sassoftware/viya4-deployment/blob/main/CODE_OF_CONDUCT.md) + options: + - label: I agree to follow this project's Code of Conduct + required: true From 15bd2b91c57bd9113ee005599d4dc2ba3467994f Mon Sep 17 00:00:00 2001 From: Ritika Patil <94649368+riragh@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:40:04 -0500 Subject: [PATCH 5/5] docs: (IAC-1236) Updated Dependencies.md file with correct versions (#534) --- docs/user/Dependencies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index cfbf85a1..81b9d3f3 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -23,7 +23,7 @@ The following list details our dependencies and versions (~ indicates multiple p | pip3 | urllib3 | 1.26.18 | | ansible-galaxy | community.docker | 3.8.0 | | ansible-galaxy | ansible.utils | 3.1.0 | -| ansible-galaxy | kubernetes.core | 3.0.1 | +| ansible-galaxy | kubernetes.core | 3.0.0 | If you are using a provider based kubeconfig file created by viya4-iac-gcp:4.5.0 or newer, install these dependencies: | SOURCE | NAME | VERSION |