From ee588ab0e5c3de49a76db75f86a85067d4473af3 Mon Sep 17 00:00:00 2001 From: ycz Date: Thu, 5 Dec 2024 15:57:36 +0800 Subject: [PATCH] toc k8s change name --- toc-upgrade/elastic/elastic.yaml | 8 +- toc-upgrade/jenkins/jenkins.yaml | 2 +- toc-upgrade/kafka/akhq.yaml | 2 +- toc-upgrade/kubesphere/k8scluster.yaml | 44 +++--- toc-upgrade/mongo/mongo.yaml | 2 +- toc-upgrade/mysql/mysql.yaml | 2 +- toc-upgrade/redis/redis.yaml | 2 +- toc-upgrade/service_group/config-server.yaml | 107 ------------- .../service_group/discover-service.yaml | 144 ------------------ 9 files changed, 31 insertions(+), 282 deletions(-) delete mode 100644 toc-upgrade/service_group/config-server.yaml delete mode 100644 toc-upgrade/service_group/discover-service.yaml diff --git a/toc-upgrade/elastic/elastic.yaml b/toc-upgrade/elastic/elastic.yaml index 2efc774..63e072f 100644 --- a/toc-upgrade/elastic/elastic.yaml +++ b/toc-upgrade/elastic/elastic.yaml @@ -22,7 +22,7 @@ spec: - key: kubernetes.io/hostname operator: In values: - - bfs-k8snode-10-2-1-14.hetzner.base.drillinsight.com + - drill-k8snode-10-2-1-14.base.drillinsight.com --- apiVersion: v1 @@ -48,7 +48,7 @@ spec: - key: kubernetes.io/hostname operator: In values: - - bfs-k8snode-10-2-1-15.hetzner.base.drillinsight.com + - drill-k8snode-10-2-1-15.base.drillinsight.com --- apiVersion: v1 @@ -74,7 +74,7 @@ spec: - key: kubernetes.io/hostname operator: In values: - - bfs-k8snode-10-2-1-16.hetzner.base.drillinsight.com + - drill-k8snode-10-2-1-16.base.drillinsight.com --- apiVersion: apps/v1 @@ -117,7 +117,7 @@ spec: name: transport env: - name: cluster.name - value: bfs-elastic-tcs-1 + value: drill-elastic-tcs-1 - name: network.host value: 0.0.0.0 - name: node.name diff --git a/toc-upgrade/jenkins/jenkins.yaml b/toc-upgrade/jenkins/jenkins.yaml index 431f337..7875516 100644 --- a/toc-upgrade/jenkins/jenkins.yaml +++ b/toc-upgrade/jenkins/jenkins.yaml @@ -76,7 +76,7 @@ spec: - key: kubernetes.io/hostname operator: In values: - - bfs-k8snode-10-2-1-14.hetzner.base.drillinsight.com + - drill-k8snode-10-2-1-14.base.drillinsight.com --- apiVersion: apps/v1 diff --git a/toc-upgrade/kafka/akhq.yaml b/toc-upgrade/kafka/akhq.yaml index 0d62ff7..1fe1301 100644 --- a/toc-upgrade/kafka/akhq.yaml +++ b/toc-upgrade/kafka/akhq.yaml @@ -19,7 +19,7 @@ data: default-group: no-roles basic-auth: - username: admin - password: "$2a$10$zBr9YyaCto68TJ.aYsP8/eQXHm5MqJUULRm0OpzEOowhmG2Pjv2ry" + password: "$2a$12$Os.huYYy.N3G1CguFVi6ReyEQl/F0zzZkecNZBadHcH.q6c3kWksS" passwordHash: BCRYPT groups: - admin diff --git a/toc-upgrade/kubesphere/k8scluster.yaml b/toc-upgrade/kubesphere/k8scluster.yaml index 02e9a30..54352a3 100644 --- a/toc-upgrade/kubesphere/k8scluster.yaml +++ b/toc-upgrade/kubesphere/k8scluster.yaml @@ -1,34 +1,34 @@ apiVersion: kubekey.kubesphere.io/v1alpha2 kind: Cluster metadata: - name: bfs-k8scluster-1 + name: drill-k8scluster-1 spec: hosts: - - {name: bfs-k8smaster-10-2-1-11.hetzner.base.drillinsight.com, address: 10.2.1.11, internalAddress: 10.2.1.11, privateKeyPath: "~/.ssh/bfs-ed25519"} - - {name: bfs-k8smaster-10-2-1-12.hetzner.base.drillinsight.com, address: 10.2.1.12, internalAddress: 10.2.1.12, privateKeyPath: "~/.ssh/bfs-ed25519"} - - {name: bfs-k8smaster-10-2-1-13.hetzner.base.drillinsight.com, address: 10.2.1.13, internalAddress: 10.2.1.13, privateKeyPath: "~/.ssh/bfs-ed25519"} - - {name: bfs-k8snode-10-2-1-14.hetzner.base.drillinsight.com, address: 10.2.1.14, internalAddress: 10.2.1.14, privateKeyPath: "~/.ssh/bfs-ed25519"} - - {name: bfs-k8snode-10-2-1-15.hetzner.base.drillinsight.com, address: 10.2.1.15, internalAddress: 10.2.1.15, privateKeyPath: "~/.ssh/bfs-ed25519"} - - {name: bfs-k8snode-10-2-1-16.hetzner.base.drillinsight.com, address: 10.2.1.16, internalAddress: 10.2.1.16, privateKeyPath: "~/.ssh/bfs-ed25519"} - - {name: bfs-k8snode-10-2-1-17.hetzner.base.drillinsight.com, address: 10.2.1.17, internalAddress: 10.2.1.17, privateKeyPath: "~/.ssh/bfs-ed25519"} - - {name: bfs-k8snode-10-2-1-18.hetzner.base.drillinsight.com, address: 10.2.1.18, internalAddress: 10.2.1.18, privateKeyPath: "~/.ssh/bfs-ed25519"} - - {name: bfs-k8snode-10-2-1-19.hetzner.base.drillinsight.com, address: 10.2.1.19, internalAddress: 10.2.1.19, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8smaster-10-2-1-11.base.drillinsight.com, address: 10.2.1.11, internalAddress: 10.2.1.11, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8smaster-10-2-1-12.base.drillinsight.com, address: 10.2.1.12, internalAddress: 10.2.1.12, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8smaster-10-2-1-13.base.drillinsight.com, address: 10.2.1.13, internalAddress: 10.2.1.13, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8snode-10-2-1-14.base.drillinsight.com, address: 10.2.1.14, internalAddress: 10.2.1.14, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8snode-10-2-1-15.base.drillinsight.com, address: 10.2.1.15, internalAddress: 10.2.1.15, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8snode-10-2-1-16.base.drillinsight.com, address: 10.2.1.16, internalAddress: 10.2.1.16, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8snode-10-2-1-17.base.drillinsight.com, address: 10.2.1.17, internalAddress: 10.2.1.17, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8snode-10-2-1-18.base.drillinsight.com, address: 10.2.1.18, internalAddress: 10.2.1.18, privateKeyPath: "~/.ssh/bfs-ed25519"} + - {name: drill-k8snode-10-2-1-19.base.drillinsight.com, address: 10.2.1.19, internalAddress: 10.2.1.19, privateKeyPath: "~/.ssh/bfs-ed25519"} roleGroups: etcd: - - bfs-k8smaster-10-2-1-11.hetzner.base.drillinsight.com - - bfs-k8smaster-10-2-1-12.hetzner.base.drillinsight.com - - bfs-k8smaster-10-2-1-13.hetzner.base.drillinsight.com + - drill-k8smaster-10-2-1-11.base.drillinsight.com + - drill-k8smaster-10-2-1-12.base.drillinsight.com + - drill-k8smaster-10-2-1-13.base.drillinsight.com control-plane: - - bfs-k8smaster-10-2-1-11.hetzner.base.drillinsight.com - - bfs-k8smaster-10-2-1-12.hetzner.base.drillinsight.com - - bfs-k8smaster-10-2-1-13.hetzner.base.drillinsight.com + - drill-k8smaster-10-2-1-11.base.drillinsight.com + - drill-k8smaster-10-2-1-12.base.drillinsight.com + - drill-k8smaster-10-2-1-13.base.drillinsight.com worker: - - bfs-k8snode-10-2-1-14.hetzner.base.drillinsight.com - - bfs-k8snode-10-2-1-15.hetzner.base.drillinsight.com - - bfs-k8snode-10-2-1-16.hetzner.base.drillinsight.com - - bfs-k8snode-10-2-1-17.hetzner.base.drillinsight.com - - bfs-k8snode-10-2-1-18.hetzner.base.drillinsight.com - - bfs-k8snode-10-2-1-19.hetzner.base.drillinsight.com + - drill-k8snode-10-2-1-14.base.drillinsight.com + - drill-k8snode-10-2-1-15.base.drillinsight.com + - drill-k8snode-10-2-1-16.base.drillinsight.com + - drill-k8snode-10-2-1-17.base.drillinsight.com + - drill-k8snode-10-2-1-18.base.drillinsight.com + - drill-k8snode-10-2-1-19.base.drillinsight.com controlPlaneEndpoint: ## Internal loadbalancer for apiservers # internalLoadbalancer: haproxy diff --git a/toc-upgrade/mongo/mongo.yaml b/toc-upgrade/mongo/mongo.yaml index a1e9047..6f1a0d0 100644 --- a/toc-upgrade/mongo/mongo.yaml +++ b/toc-upgrade/mongo/mongo.yaml @@ -52,7 +52,7 @@ spec: - key: "kubernetes.io/hostname" operator: In values: - - bfs-k8snode-10-2-1-15.hetzner.base.drillinsight.com + - drill-k8snode-10-2-1-15.base.drillinsight.com --- apiVersion: v1 diff --git a/toc-upgrade/mysql/mysql.yaml b/toc-upgrade/mysql/mysql.yaml index 8f67a4d..003c778 100644 --- a/toc-upgrade/mysql/mysql.yaml +++ b/toc-upgrade/mysql/mysql.yaml @@ -56,7 +56,7 @@ spec: - key: "kubernetes.io/hostname" operator: In values: - - bfs-k8snode-10-2-1-16.hetzner.base.drillinsight.com + - drill-k8snode-10-2-1-16.base.drillinsight.com --- apiVersion: v1 kind: Service diff --git a/toc-upgrade/redis/redis.yaml b/toc-upgrade/redis/redis.yaml index 0ca3a6c..be26979 100644 --- a/toc-upgrade/redis/redis.yaml +++ b/toc-upgrade/redis/redis.yaml @@ -70,7 +70,7 @@ spec: - key: "kubernetes.io/hostname" operator: In values: - - bfs-k8snode-10-2-1-17.hetzner.base.drillinsight.com + - drill-k8snode-10-2-1-17.base.drillinsight.com --- apiVersion: v1 diff --git a/toc-upgrade/service_group/config-server.yaml b/toc-upgrade/service_group/config-server.yaml deleted file mode 100644 index 40c8028..0000000 --- a/toc-upgrade/service_group/config-server.yaml +++ /dev/null @@ -1,107 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: config-server -data: - application.yml: | - server: - port: 8888 - spring: - cloud: - config: - server: - git: - uri: https://github.com/beaconfire-projects/cloud-config.git - search-paths: - - '{application}' - - micro/* - username: zyu@beaconfireinc.com - password: ENC(5/I4EP0HwkLv/ZFigX3bmP+U/yR0HAOgWpbVg4tHuREz0G9CfOZzZfFTHA342PpoLYVkj924iqo=) - bus: - refresh: - enabled: true - trace: - enabled: true - stream: - kafka: - binder: - brokers: http://kafka-0-internal.basic:9092,http://kafka-1-internal.basic:9092, http://kafka-2-internal.basic:9092 - - jasypt: - encryptor: - algorithm: PBEWithMD5AndDES - iv-generator-classname: org.jasypt.iv.NoIvGenerator - - management: - endpoints: - web: - exposure: - include: 'busrefresh' #refresh - - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: config-server -spec: - replicas: 1 - selector: - matchLabels: - app: config-server - template: - metadata: - labels: - app: config-server - spec: - imagePullSecrets: - - name: docker-regcred - containers: - - name: config-server - image: beaconfireiic/config-server:1.1.1-prod - imagePullPolicy: Always - ports: - - name: http - containerPort: 8888 - protocol: TCP - env: - - name: "LOGGING_LEVEL_ROOT" - value: "info" - - name: "SERVER_PORT" - value: "8888" - - name: "LOG_APP-NAME" - value: "config-server" - volumeMounts: - - name: config - mountPath: /app/application.yml - subPath: application.yml - - name: app-logs - mountPath: /logs - resources: - requests: - cpu: 0.1 - memory: 256Mi - limits: - cpu: 1 - memory: 2Gi - volumes: - - name: config - configMap: - name: config-server - - name: app-logs - hostPath: - path: /data/app_logs/config-server ---- -apiVersion: v1 -kind: Service -metadata: - name: config-server -spec: - type: ClusterIP - ports: - - name: http - protocol: TCP - port: 8888 - targetPort: http - selector: - app: config-server \ No newline at end of file diff --git a/toc-upgrade/service_group/discover-service.yaml b/toc-upgrade/service_group/discover-service.yaml deleted file mode 100644 index ec495bf..0000000 --- a/toc-upgrade/service_group/discover-service.yaml +++ /dev/null @@ -1,144 +0,0 @@ -# apiVersion: v1 -# kind: ConfigMap -# metadata: -# name: discovery-service -# data: - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: discovery-service -spec: - replicas: 1 - selector: - matchLabels: - app: discovery-service - template: - metadata: - labels: - app: discovery-service - spec: - imagePullSecrets: - - name: docker-regcred - containers: - - name: discovery-service - image: beaconfireiic/service-discovery:1.1.0 - imagePullPolicy: Always - ports: - - name: http - containerPort: 8761 - protocol: TCP - env: - - name: "LOGGING_LEVEL_ROOT" - value: "info" - - name: "EUREKA_INSTANCE_HOSTNAME" - value: "discovery-service" - - name: "SERVER_PORT" - value: "8761" - - name: "LOG_APP-NAME" - value: "discovery-service" - - name: "SPRING_PROFILES_ACTIVE" - value: "sdet" - volumeMounts: - - name: app-logs - mountPath: /logs - resources: - requests: - cpu: 0.1 - memory: 128Mi - limits: - cpu: 1 - memory: 2Gi - volumes: - - name: app-logs - hostPath: - path: /data/app_logs/discovery-service ---- -apiVersion: v1 -kind: Service -metadata: - name: discovery-service -spec: - type: ClusterIP - ports: - - name: http - protocol: TCP - port: 8761 - targetPort: http - selector: - app: discovery-service - ---- -# apiVersion: v1 -# kind: ConfigMap -# metadata: -# name: gateway -# data: - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: gateway -spec: - replicas: 1 - selector: - matchLabels: - app: gateway - template: - metadata: - labels: - app: gateway - spec: - imagePullSecrets: - - name: docker-regcred - containers: - - name: gateway - image: beaconfireiic/gateway:1.1.0 - imagePullPolicy: Always - ports: - - name: http - containerPort: 8888 - protocol: TCP - env: - - name: "LOGGING_LEVEL_ROOT" - value: "info" - - name: "EUREKA_INSTANCE_HOSTNAME" - value: "discovery-service" - - name: "SERVER_PORT" - value: "8888" - - name: "EUREKA_CLIENT_SERVICE-URL_DEFAULT-ZONE" - value: "http://discovery-service:8761/eureka/" - - name: "LOG_APP-NAME" - value: "gateway" - - name: "SPRING_PROFILES_ACTIVE" - value: "sdet" - volumeMounts: - - name: app-logs - mountPath: /logs - resources: - requests: - cpu: 0.1 - memory: 128Mi - limits: - cpu: 1 - memory: 2Gi - volumes: - - name: app-logs - hostPath: - path: /data/app_logs/gateway ---- -apiVersion: v1 -kind: Service -metadata: - name: gateway -spec: - type: ClusterIP - ports: - - name: http - protocol: TCP - port: 8888 - targetPort: http - selector: - app: gateway \ No newline at end of file