release 3.5.2

This commit is contained in:
변정훈
2023-07-05 10:19:53 +09:00
parent ed683e0f6c
commit b1e21a0ee9
8 changed files with 42 additions and 19 deletions

View File

@@ -6,4 +6,4 @@
KUBECONFIG: /root/.kube/ansible_config
roles:
- role: cmoa_install
delegate_to: 127.0.0.1
#delegate_to: 127.0.0.1

View File

@@ -1,11 +1,11 @@
[master]
10.10.10.10
10.10.43.200
[worker1]
10.10.10.11
10.10.43.201
[worker2]
10.10.10.12
10.10.43.202
[cluster:children]
master
@@ -15,7 +15,7 @@ worker2
[master:vars]
kubernetes_role="master"
runtime="docker"
runtime="containerd"
[worker1:vars]
kubernetes_role="node"
@@ -23,4 +23,4 @@ runtime="containerd"
[worker2:vars]
kubernetes_role="node"
runtime="crio"
runtime="containerd"

BIN
roles/cmoa_install/.DS_Store vendored Normal file

Binary file not shown.

View File

0
roles/cmoa_install/files/00-default/secret_nexus.yaml Normal file → Executable file
View File

View File

@@ -1215,6 +1215,10 @@ CREATE TABLE cmoa_job_base (
create_time timestamp default now(),
PRIMARY KEY (kube_flatting_time, cluster_id, kind, metadata_uid, row_index)
);
CREATE INDEX cmoa_job_base_index_1
on cmoa_job_base (metadata_uid);
CREATE INDEX cmoa_job_base_index_2
on cmoa_job_base (kind);
----------------------------
CREATE TABLE cmoa_job_template (
kube_flatting_time bigint,
@@ -1443,6 +1447,10 @@ CREATE TABLE cmoa_pod_base (
create_time timestamp default now(),
PRIMARY KEY (kube_flatting_time, cluster_id, kind, metadata_uid, row_index)
);
CREATE INDEX cmoa_pod_base_index_1
on cmoa_pod_base (metadata_ownerReferences_uid);
CREATE INDEX cmoa_pod_base_index_2
on cmoa_pod_base (metadata_ownerreferences_kind);
----------------------------
CREATE TABLE cmoa_pod_conditions (
kube_flatting_time bigint,
@@ -1664,7 +1672,22 @@ CREATE TABLE cmoa_secret_base (
create_time timestamp default now(),
PRIMARY KEY (kube_flatting_time, cluster_id, kind, metadata_uid, row_index)
);
----------------------------
CREATE VIEW v_cmoa_job AS
select Q.kube_flatting_time, Q.cluster_id, Q.metadata_ownerreferences_kind, Q.metadata_uid, K.status_phase
from (select A.kube_flatting_time as job_flatting_time, A.metadata_uid as job_metadata_uid, B.kube_flatting_time as pod_flatting_time
from (select metadata_uid, max(kube_flatting_time) as kube_flatting_time
from cmoa_job_base
where kind='Job' and kube_flatting_time > extract(epoch from (CURRENT_TIMESTAMP - INTERVAL '1 hours'))*1000
group by metadata_uid) A,
(select metadata_ownerreferences_uid, max(kube_flatting_time) as kube_flatting_time
from cmoa_pod_base
where metadata_ownerreferences_kind='Job' and kube_flatting_time > extract(epoch from (CURRENT_TIMESTAMP - INTERVAL '1 hours'))*1000
group by metadata_ownerreferences_uid) B
where A.metadata_uid = B.metadata_ownerreferences_uid) J
inner join cmoa_job_base Q on Q.metadata_uid = J.job_metadata_uid and Q.kube_flatting_time = J.job_flatting_time
inner join cmoa_pod_base K on K.metadata_ownerreferences_uid = J.job_metadata_uid and K.kube_flatting_time = J.pod_flatting_time
group by Q.kube_flatting_time, Q.cluster_id, Q.metadata_ownerreferences_kind, Q.metadata_uid, K.status_phase;
CREATE TABLE public.api_error_history (
id int8 NOT NULL,
@@ -1710,4 +1733,4 @@ CREATE TABLE public.tenant_info_auth_resources (
-- public.tenant_info_auth_resources foreign keys
ALTER TABLE public.tenant_info_auth_resources ADD CONSTRAINT fkkecsc13ydhwg8u05aumkqbnx1 FOREIGN KEY (tenant_info_id) REFERENCES public.tenant_info(id);
ALTER TABLE public.tenant_info_auth_resources ADD CONSTRAINT fkpvvec4ju3hsma6s1rtgvr4mf6 FOREIGN KEY (auth_resources_id) REFERENCES public.auth_resource3(id);
ALTER TABLE public.tenant_info_auth_resources ADD CONSTRAINT fkpvvec4ju3hsma6s1rtgvr4mf6 FOREIGN KEY (auth_resources_id) REFERENCES public.auth_resource3(id);

View File

@@ -24,4 +24,4 @@
cmoa: worker2
with_items:
- "{{ ansible_hostname }}"
when: ansible_default_ipv4.address in groups.worker2
when: ansible_default_ipv4.address in groups.worker2

View File

@@ -1,15 +1,15 @@
---
- name: Update and upgrade apt packages
apt:
upgrade: yes
update_cache: yes
force_apt_get: yes
cache_valid_time: 86400
#- name: Update and upgrade apt packages
# apt:
# upgrade: yes
# update_cache: yes
# force_apt_get: yes
# cache_valid_time: 86400
- name: Install apt packages
apt:
name: ['cloud-utils', 'apt-transport-https', 'ca-certificates', 'curl', 'socat', 'conntrack', 'gnupg', 'lsb-release', 'bash-completion', 'chrony']
state: present
#- name: Install apt packages
# apt:
# name: ['cloud-utils', 'apt-transport-https', 'ca-certificates', 'curl', 'socat', 'conntrack', 'gnupg', 'lsb-release', 'bash-completion', 'chrony']
# state: present
- name: Disable ufw
command: 'ufw disable'