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

ns-sablier を導入 #647

Merged
merged 6 commits into from
Jan 18, 2025
Merged

ns-sablier を導入 #647

merged 6 commits into from
Jan 18, 2025

Conversation

cp-20
Copy link
Contributor

@cp-20 cp-20 commented Jan 18, 2025

NeoShowcase のアプリローディング画面をカスタマイズするため

@cp-20 cp-20 requested a review from pirosiki197 January 18, 2025 15:53
Copy link

github-actions bot commented Jan 18, 2025

Diff

@@ spec.template.spec.volumes.config.configMap.name @@
# apps/v1/Deployment/ns-system/ns-builder
! ± value change
- ns-config-27677k25bb
+ ns-config-5dfc665ck6

@@ spec.template.spec.volumes.config.configMap.name @@
# apps/v1/Deployment/ns-system/ns-gateway
! ± value change
- ns-config-27677k25bb
+ ns-config-5dfc665ck6

@@ spec.template.spec.volumes.config.configMap.name @@
# apps/v1/StatefulSet/ns-system/ns-controller
! ± value change
- ns-config-27677k25bb
+ ns-config-5dfc665ck6

@@ spec.template.spec.volumes.config.configMap.name @@
# apps/v1/StatefulSet/ns-system/ns-gitea-integration
! ± value change
- ns-config-27677k25bb
+ ns-config-5dfc665ck6

@@ spec.template.spec.volumes.config.configMap.name @@
# apps/v1/StatefulSet/ns-system/ns-ssgen
! ± value change
- ns-config-27677k25bb
+ ns-config-5dfc665ck6

@@ data.ns.yaml @@
# v1/ConfigMap/ns-system/ns-config-5dfc665ck6
! ± value change in multiline text (three inserts, three deletions)
  privateKeyFile: /keys/id_ed25519
  additionalLinks:
    - name: Wiki
      url: https://wiki.trap.jp/services/NeoShowcase
  
  [121 lines unchanged)]
  
          ipFamilyPolicy: SingleStack
        middleware:
          sablier:
            enable: true
-           url: http://sablier.sablier.svc.cluster.local
+           url: http://ns-sablier.ns-system.svc.cluster.local
            sessionDuration: 1h
            dynamic:
-             theme: ghost
+             theme: neoshowcase
            blocking:
              timeout: 1m
        tls:
          type: cert-manager
  
  [63 lines unchanged)]
  
      log:
        type: loki
        loki:
          endpoint: http://loki.monitor.svc.cluster.local:3100
-         queryTemplate: "{namespace=\"ns-apps\",pod=\"nsapp-{{ .App.ID }}-0\"}"
+         queryTemplate: '{namespace="ns-apps",pod="nsapp-{{ .App.ID }}-0"}'
      metrics:
        type: prometheus
        prometheus:
          endpoint: http://victoria-metrics.monitor.svc.cluster.local
  
  [22 lines unchanged)]
  
          adminAPI: http://localhost:2019
          docsRoot: /artifacts
      controller:
        url: http://ns-controller.ns-system.svc.cluster.local:10000

@@ metadata.name @@
# v1/ConfigMap/ns-system/ns-config-5dfc665ck6
! ± value change
- ns-config-27677k25bb
+ ns-config-5dfc665ck6

@@ (root level) @@
# v1/ServiceAccount/ns-system/ns-sablier
! + one document added:
+   ---
+   apiVersion: v1
+   kind: ServiceAccount
+   metadata:
+     name: ns-sablier
+     namespace: ns-system

@@ (root level) @@
# rbac.authorization.k8s.io/v1/ClusterRole/ns-system/ns-sablier
! + one document added:
+   ---
+   apiVersion: rbac.authorization.k8s.io/v1
+   kind: ClusterRole
+   metadata:
+     name: ns-sablier
+     namespace: ns-system
+   rules:
+   - resources:
+     - deployments
+     - statefulsets
+     apiGroups:
+     - apps
+     - 
+     verbs:
+     - get
+     - list
+     - watch
+   - resources:
+     - deployments/scale
+     - statefulsets/scale
+     apiGroups:
+     - apps
+     - 
+     verbs:
+     - patch
+     - update
+     - get
+     - list
+     - watch

@@ (root level) @@
# rbac.authorization.k8s.io/v1/ClusterRoleBinding/ns-system/ns-sablier
! + one document added:
+   ---
+   apiVersion: rbac.authorization.k8s.io/v1
+   kind: ClusterRoleBinding
+   metadata:
+     name: ns-sablier
+     namespace: ns-system
+   roleRef:
+     name: ns-sablier
+     apiGroup: rbac.authorization.k8s.io
+     kind: ClusterRole
+   subjects:
+   - name: ns-sablier
+     kind: ServiceAccount
+     namespace: ns-sablier

@@ (root level) @@
# v1/ConfigMap/ns-system/ns-sablier-c94dc6kkfg
! + one document added:
+   ---
+   apiVersion: v1
+   data:
+     ns-sablier.yaml: |
+       provider:
+         name: kubernetes
+       
+   kind: ConfigMap
+   metadata:
+     name: ns-sablier-c94dc6kkfg
+     namespace: ns-system

@@ (root level) @@
# v1/Service/ns-system/ns-sablier
! + one document added:
+   ---
+   apiVersion: v1
+   kind: Service
+   metadata:
+     name: ns-sablier
+     namespace: ns-system
+   spec:
+     type: ClusterIP
+     selector:
+       app: ns-sablier
+     ports:
+     - name: http
+       port: 80
+       targetPort: http

@@ (root level) @@
# apps/v1/Deployment/ns-system/ns-sablier
! + one document added:
+   ---
+   apiVersion: apps/v1
+   kind: Deployment
+   metadata:
+     name: ns-sablier
+     namespace: ns-system
+   spec:
+     replicas: 1
+     selector:
+       matchLabels:
+         app: ns-sablier
+     template:
+       metadata:
+         labels:
+           app: ns-sablier
+       spec:
+         containers:
+         - name: ns-sablier
+           image: "ghcr.io/traptitech/ns-sablier:1.7.1"
+           ports:
+           - name: http
+             containerPort: 10000
+           volumeMounts:
+           - name: config
+             mountPath: /etc/sablier
+         enableServiceLinks: false
+         volumes:
+         - name: config
+           configMap:
+             name: ns-sablier-c94dc6kkfg

Copy link
Contributor

@pirosiki197 pirosiki197 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ありがとう

@cp-20 cp-20 merged commit 39e0604 into main Jan 18, 2025
4 checks passed
@cp-20 cp-20 deleted the feat/ns-sablier branch January 18, 2025 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants