From d51c656ae2b6a308afb135b49c8a8e07d5629e15 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:19:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=9E=E3=83=8B=E3=83=95=E3=82=A7?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imagepolicy.yaml | 4 +-- .../kustomization.yaml | 0 .../repository.yaml | 4 +-- manifests/imageautomation/kustomization.yaml | 8 ++--- .../imagepolicy.yaml | 0 .../kustomization.yaml | 0 .../repository.yaml | 0 .../manifests/control-internal/endpoint.yaml | 14 -------- .../control-internal/kustomization.yaml | 4 --- .../manifests/control-internal/monitor.yaml | 14 -------- .../manifests/control-internal/service.yaml | 15 --------- .../frontend-camera-sender/deployment.yaml | 2 +- manifests/manifests/kustomization.yaml | 12 +++---- .../manifests/positioning/deployment.yaml | 33 ------------------- .../manifests/positioning/ingressroute.yaml | 14 -------- .../manifests/positioning/kustomization.yaml | 4 --- manifests/manifests/positioning/service.yaml | 13 -------- manifests/manifests/speed/endpoint.yaml | 14 -------- manifests/manifests/speed/kustomization.yaml | 4 --- manifests/manifests/speed/monitor.yaml | 15 --------- manifests/manifests/speed/service.yaml | 15 --------- 21 files changed, 14 insertions(+), 175 deletions(-) rename manifests/imageautomation/{positioning => frontend-camera-sender}/imagepolicy.yaml (78%) rename manifests/imageautomation/{positioning => frontend-camera-sender}/kustomization.yaml (100%) rename manifests/imageautomation/{positioning => frontend-camera-sender}/repository.yaml (59%) rename manifests/imageautomation/{receiver => webrtc-receiver}/imagepolicy.yaml (100%) rename manifests/imageautomation/{receiver => webrtc-receiver}/kustomization.yaml (100%) rename manifests/imageautomation/{receiver => webrtc-receiver}/repository.yaml (100%) delete mode 100644 manifests/manifests/control-internal/endpoint.yaml delete mode 100644 manifests/manifests/control-internal/kustomization.yaml delete mode 100644 manifests/manifests/control-internal/monitor.yaml delete mode 100644 manifests/manifests/control-internal/service.yaml delete mode 100644 manifests/manifests/positioning/deployment.yaml delete mode 100644 manifests/manifests/positioning/ingressroute.yaml delete mode 100644 manifests/manifests/positioning/kustomization.yaml delete mode 100644 manifests/manifests/positioning/service.yaml delete mode 100644 manifests/manifests/speed/endpoint.yaml delete mode 100644 manifests/manifests/speed/kustomization.yaml delete mode 100644 manifests/manifests/speed/monitor.yaml delete mode 100644 manifests/manifests/speed/service.yaml diff --git a/manifests/imageautomation/positioning/imagepolicy.yaml b/manifests/imageautomation/frontend-camera-sender/imagepolicy.yaml similarity index 78% rename from manifests/imageautomation/positioning/imagepolicy.yaml rename to manifests/imageautomation/frontend-camera-sender/imagepolicy.yaml index b5056c84..b5d13b8f 100644 --- a/manifests/imageautomation/positioning/imagepolicy.yaml +++ b/manifests/imageautomation/frontend-camera-sender/imagepolicy.yaml @@ -1,11 +1,11 @@ apiVersion: image.toolkit.fluxcd.io/v1beta1 kind: ImagePolicy metadata: - name: positioning + name: frontend-camera-sender namespace: plarail2021 spec: imageRepositoryRef: - name: positioning + name: frontend-camera-sender filterTags: pattern: '[a-f0-9]+-(?P[0-9]+)' extract: '$ts' diff --git a/manifests/imageautomation/positioning/kustomization.yaml b/manifests/imageautomation/frontend-camera-sender/kustomization.yaml similarity index 100% rename from manifests/imageautomation/positioning/kustomization.yaml rename to manifests/imageautomation/frontend-camera-sender/kustomization.yaml diff --git a/manifests/imageautomation/positioning/repository.yaml b/manifests/imageautomation/frontend-camera-sender/repository.yaml similarity index 59% rename from manifests/imageautomation/positioning/repository.yaml rename to manifests/imageautomation/frontend-camera-sender/repository.yaml index 61fb57e5..40bf49f9 100644 --- a/manifests/imageautomation/positioning/repository.yaml +++ b/manifests/imageautomation/frontend-camera-sender/repository.yaml @@ -1,8 +1,8 @@ apiVersion: image.toolkit.fluxcd.io/v1beta1 kind: ImageRepository metadata: - name: positioning + name: frontend-camera-sender namespace: plarail2021 spec: - image: ghcr.io/ueckoken/plarail2022-positioning + image: ghcr.io/ueckoken/plarail2022-camera_sender interval: 1m0s diff --git a/manifests/imageautomation/kustomization.yaml b/manifests/imageautomation/kustomization.yaml index 277b3608..66940a60 100644 --- a/manifests/imageautomation/kustomization.yaml +++ b/manifests/imageautomation/kustomization.yaml @@ -1,11 +1,11 @@ resources: + - ./auto-operation - ./external - ./frontend + - ./frontend-camera-sender - ./frontend-python - ./internal + - ./logviewer + - ./webrtc-receiver - ./webrtc-sender - - ./receiver - ./automation.yaml - - ./positioning - - ./auto-operation - - ./logviewer diff --git a/manifests/imageautomation/receiver/imagepolicy.yaml b/manifests/imageautomation/webrtc-receiver/imagepolicy.yaml similarity index 100% rename from manifests/imageautomation/receiver/imagepolicy.yaml rename to manifests/imageautomation/webrtc-receiver/imagepolicy.yaml diff --git a/manifests/imageautomation/receiver/kustomization.yaml b/manifests/imageautomation/webrtc-receiver/kustomization.yaml similarity index 100% rename from manifests/imageautomation/receiver/kustomization.yaml rename to manifests/imageautomation/webrtc-receiver/kustomization.yaml diff --git a/manifests/imageautomation/receiver/repository.yaml b/manifests/imageautomation/webrtc-receiver/repository.yaml similarity index 100% rename from manifests/imageautomation/receiver/repository.yaml rename to manifests/imageautomation/webrtc-receiver/repository.yaml diff --git a/manifests/manifests/control-internal/endpoint.yaml b/manifests/manifests/control-internal/endpoint.yaml deleted file mode 100644 index 87e62191..00000000 --- a/manifests/manifests/control-internal/endpoint.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Endpoints -metadata: - name: control-internal - namespace: monitoring - labels: - app: control-internal -subsets: -- addresses: - - ip: 130.153.17.100 - ports: - - name: prom - port: 443 - protocol: TCP diff --git a/manifests/manifests/control-internal/kustomization.yaml b/manifests/manifests/control-internal/kustomization.yaml deleted file mode 100644 index 8fbc06b9..00000000 --- a/manifests/manifests/control-internal/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -resources: - - ./endpoint.yaml -# - ./service.yaml -# - ./monitor.yaml diff --git a/manifests/manifests/control-internal/monitor.yaml b/manifests/manifests/control-internal/monitor.yaml deleted file mode 100644 index ef269192..00000000 --- a/manifests/manifests/control-internal/monitor.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: test - namespace: monitoring - labels: - release: monitoring-prometheus -spec: - selector: - matchLabels: - app: control-internal - endpoints: - - port: prom - path: /metrics diff --git a/manifests/manifests/control-internal/service.yaml b/manifests/manifests/control-internal/service.yaml deleted file mode 100644 index 415edd0d..00000000 --- a/manifests/manifests/control-internal/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: control-internal - namespace: monitoring - labels: - app: control-internal -spec: - externalName: 130.153.17.100 - ports: - - name: prom - port: 80 - protocol: TCP - targetPort: 443 - type: ExternalName diff --git a/manifests/manifests/frontend-camera-sender/deployment.yaml b/manifests/manifests/frontend-camera-sender/deployment.yaml index d683113a..2f53102f 100644 --- a/manifests/manifests/frontend-camera-sender/deployment.yaml +++ b/manifests/manifests/frontend-camera-sender/deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: soft-camera-sender - image: ghcr.io/ueckoken/plarail2022-camera_sender:df4f652-1668679369 # FIXME + image: ghcr.io/ueckoken/plarail2022-camera_sender:df4f652-1668679369 # {"$imagepolicy": "plarail2021:frontend-camera-sender"} imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/manifests/manifests/kustomization.yaml b/manifests/manifests/kustomization.yaml index 008e100b..336a1afb 100644 --- a/manifests/manifests/kustomization.yaml +++ b/manifests/manifests/kustomization.yaml @@ -1,11 +1,9 @@ resources: - - ./frontend - - ./python-webrtc-server + - ./auto-operation - ./external + - ./frontend + - ./frontend-camera-sender + - ./internal + - ./logviewer - ./receiver-test - ./webrtc-sender - - ./logviewer - - ./internal -# - ./positioning - - ./frontend-camera-sender - - ./auto-operation diff --git a/manifests/manifests/positioning/deployment.yaml b/manifests/manifests/positioning/deployment.yaml deleted file mode 100644 index c2e0d4db..00000000 --- a/manifests/manifests/positioning/deployment.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: positioning - namespace: plarail2021 -spec: - selector: - matchLabels: - app: positioning - template: - metadata: - labels: - app: positioning - spec: - containers: - - name: positioning - image: ghcr.io/ueckoken/plarail2022-positioning:df4f652-1668679369 # {"$imagepolicy": "plarail2021:positioning"} - imagePullPolicy: Always - ports: - - containerPort: 8080 - env: - - name: DB - value: "host=127.0.0.1 user=gorm password=gorm dbname=gorm port=5432 sslmode=disable TimeZone=Asia/Tokyo" - - name: postgresql - image: postgres:11.16 - imagePullPolicy: Always - env: - - name: POSTGRES_USER - value: "gorm" - - name: POSTGRES_PASSWORD - value: "gorm" - - name: POSTGRES_DB - value: "gorm" diff --git a/manifests/manifests/positioning/ingressroute.yaml b/manifests/manifests/positioning/ingressroute.yaml deleted file mode 100644 index 75dd739d..00000000 --- a/manifests/manifests/positioning/ingressroute.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: IngressRoute -metadata: - name: positioning - namespace: plarail2021 -spec: - routes: - - kind: Rule - match: Host(`positioning.chofufes2022.ueckoken.club`) - services: - - name: positioning - port: 80 - tls: - secretName: cloudflare-cert diff --git a/manifests/manifests/positioning/kustomization.yaml b/manifests/manifests/positioning/kustomization.yaml deleted file mode 100644 index dcc8644b..00000000 --- a/manifests/manifests/positioning/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -resources: - - ./deployment.yaml - - ./service.yaml - - ./ingressroute.yaml diff --git a/manifests/manifests/positioning/service.yaml b/manifests/manifests/positioning/service.yaml deleted file mode 100644 index d8a8c936..00000000 --- a/manifests/manifests/positioning/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: positioning - namespace: plarail2021 -spec: - type: NodePort - selector: - app: positioning - ports: - - port: 80 - protocol: TCP - targetPort: 8080 diff --git a/manifests/manifests/speed/endpoint.yaml b/manifests/manifests/speed/endpoint.yaml deleted file mode 100644 index 98a78f1b..00000000 --- a/manifests/manifests/speed/endpoint.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Endpoints -metadata: - name: speed - namespace: monitoring - labels: - app: speed -subsets: -- addresses: - - ip: 130.153.17.100 - ports: - - name: prom - port: 8081 - protocol: TCP diff --git a/manifests/manifests/speed/kustomization.yaml b/manifests/manifests/speed/kustomization.yaml deleted file mode 100644 index 6ab962bf..00000000 --- a/manifests/manifests/speed/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -resources: - - ./endpoint.yaml - - ./service.yaml -# - ./monitor.yaml diff --git a/manifests/manifests/speed/monitor.yaml b/manifests/manifests/speed/monitor.yaml deleted file mode 100644 index ed266aca..00000000 --- a/manifests/manifests/speed/monitor.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor - -metadata: - name: speed - namespace: plarail2021 - labels: - release: monitoring-prometheus -spec: - selector: - matchLabels: - app: speed - endpoints: - - port: prom - path: /metrics diff --git a/manifests/manifests/speed/service.yaml b/manifests/manifests/speed/service.yaml deleted file mode 100644 index eea30717..00000000 --- a/manifests/manifests/speed/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: speed - namespace: monitoring - labels: - app: speed -spec: - externalName: 130.153.17.100 - ports: - - name: prom - port: 80 - protocol: TCP - targetPort: 8081 - type: ExternalName From ef8733654d70f0024a867e69a41ce24ccd11a33a Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:20:35 +0900 Subject: [PATCH 2/2] delete unused image build workflow --- docker-bake.hcl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 2f1d83b7..2429aa1f 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -5,7 +5,6 @@ group "default" { "internal", "json2grpc", "multicaster", - "positioning", "webrtc-sender", "camera_sender", "frontend", @@ -61,13 +60,6 @@ target "multicaster" { ] } -target "positioning" { - context = "./backend/positioning" - tags = [ - GET_TAG("positioning") - ] -} - target "webrtc-sender" { context = "./frontend/momo_sender" tags = [