Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to 3.0.1 addressing CVEs #18

Merged
merged 1 commit into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/superset-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
name: superset
chart_repo_url: "https://apache.github.io/superset"
chart_ref: superset
chart_version: 0.10.0
chart_version: 0.12.0
release_namespace: default
values: "{{ lookup('template', 'templates/values.yaml.j2') | from_yaml }}"
#dependency_update: true
1 change: 1 addition & 0 deletions ansible/templates/values.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ configOverrides:
# Will allow user self registration, allowing to create Flask users from
# Authorized User
AUTH_USER_REGISTRATION = True
SECRET_KEY = '{{ secretKey }}'

extraConfigs:
import_datasources.yaml: |
Expand Down
Binary file modified ansible/vars/eqiad1-secrets.yaml
Binary file not shown.
7 changes: 5 additions & 2 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ python3 -m venv .venv/deploy
source .venv/deploy/bin/activate
pip install ansible==8.1.0 kubernetes==26.1.0 PyMySQL==1.1.0

export KUBECONFIG=$(pwd)/tofu/kube.config
cd tofu
tofu init
tofu apply -var datacenter=${datacenter} # -auto-approve
export KUBECONFIG=$(pwd)/kube.config

cd ansible
cd ../ansible
ansible-playbook superset-deploy.yaml --extra-vars "datacenter=${datacenter}"
5 changes: 0 additions & 5 deletions tofu/123-3.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ resource "openstack_containerinfra_cluster_v1" "k8s_123_3" {
node_count = var.workers[var.datacenter]
}

resource "local_file" "kube_config" {
content = resource.openstack_containerinfra_cluster_v1.k8s_123_3.kubeconfig.raw_config
filename = "kube.config"
}

resource "openstack_containerinfra_clustertemplate_v1" "template_123_3" {
name = "superset${var.name[var.datacenter]}-123-3"
coe = "kubernetes"
Expand Down
33 changes: 33 additions & 0 deletions tofu/123-4.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
resource "openstack_containerinfra_cluster_v1" "k8s_123_4" {
name = "superset${var.name[var.datacenter]}-123-4"
cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_123_4.id
master_count = 1
node_count = var.workers[var.datacenter]
}

resource "local_file" "kube_config" {
content = resource.openstack_containerinfra_cluster_v1.k8s_123_4.kubeconfig.raw_config
filename = "kube.config"
}

resource "openstack_containerinfra_clustertemplate_v1" "template_123_4" {
name = "superset${var.name[var.datacenter]}-123-4"
coe = "kubernetes"
dns_nameserver = "8.8.8.8"
docker_storage_driver = "overlay2"
docker_volume_size = "50"
external_network_id = var.external_network_id[var.datacenter]
fixed_subnet = var.fixed_subnet[var.datacenter]
fixed_network = var.fixed_network[var.datacenter]
flavor = var.worker_flavor[var.datacenter]
floating_ip_enabled = "false"
image = var.image_name[var.datacenter]
master_flavor = var.control_flavor[var.datacenter]
network_driver = "flannel"

labels = {
kube_tag = "v1.23.15-rancher1-linux-amd64"
hyperkube_prefix = "docker.io/rancher/"
cloud_provider_enabled = "true"
}
}
Loading