Skip to content

Commit

Permalink
fix: Apply prettier reformatting
Browse files Browse the repository at this point in the history
  • Loading branch information
nielm committed Mar 14, 2024
1 parent 9db2814 commit a7915ef
Show file tree
Hide file tree
Showing 52 changed files with 1,907 additions and 1,719 deletions.
2 changes: 0 additions & 2 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ updates:
commit-message:
prefix: "fix"


# NPM dependancies -- only prompt to update minor versions.
- directory: "/"
package-ecosystem: "npm"
Expand Down Expand Up @@ -120,4 +119,3 @@ updates:
prefix: "fix"

version: 2
...
7 changes: 3 additions & 4 deletions .github/release-please.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
handleGHRelease: true
manifest: true
branches:
- branch: version_2
handleGHRelease: true
manifest: true

- branch: version_2
handleGHRelease: true
manifest: true
77 changes: 38 additions & 39 deletions .github/workflows/codehealth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,55 +14,54 @@ jobs:
strategy:
fail-fast: false


steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20
check-latest: true
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20
check-latest: true

- name: Install eslint and typescript compiler
run: npm install
- name: Install eslint and typescript compiler
run: npm install

- name: Install node modules in src/
working-directory: src
run: npm install
- name: Install node modules in src/
working-directory: src
run: npm install

- name: Execute "npm run typecheck"
working-directory: .
run: npm run typecheck
- name: Execute "npm run typecheck"
working-directory: .
run: npm run typecheck

- name: Execute "npm run eslint"
run: npm run eslint
- name: Execute "npm run eslint"
run: npm run eslint

- name: NPM Audit src/
working-directory: src
run: npm audit
- name: NPM Audit src/
working-directory: src
run: npm audit

- name: NPM Audit src/forwarder
working-directory: src/forwarder
run: npm audit
- name: NPM Audit src/forwarder
working-directory: src/forwarder
run: npm audit

- name: NPM Audit src/poller
working-directory: src/poller
run: npm audit
- name: NPM Audit src/poller
working-directory: src/poller
run: npm audit

- name: NPM Audit src/poller/poller-core
working-directory: src/poller/poller-core
run: npm audit
- name: NPM Audit src/poller/poller-core
working-directory: src/poller/poller-core
run: npm audit

- name: NPM Audit src/scaler
working-directory: src/scaler
run: npm audit
- name: NPM Audit src/scaler
working-directory: src/scaler
run: npm audit

- name: NPM Audit src/scaler/scaler-core
working-directory: src/scaler/scaler-core
run: npm audit
- name: NPM Audit src/scaler/scaler-core
working-directory: src/scaler/scaler-core
run: npm audit

- name: NPM Audit root
working-directory: .
run: npm audit
- name: NPM Audit root
working-directory: .
run: npm audit
59 changes: 29 additions & 30 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
push:
pull_request:
schedule:
- cron: '27 22 * * 5'
- cron: "27 22 * * 5"

jobs:
analyze:
Expand All @@ -29,43 +29,42 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ["javascript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
13 changes: 6 additions & 7 deletions .github/workflows/linters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ on: [push, pull_request]

jobs:
delivery:

runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v4
- name: Run mdl
uses: actionshub/markdownlint@main
with:
filesToIgnoreRegex: code\-of\-conduct\.md|CHANGELOG.md
- name: Check out code
uses: actions/checkout@v4
- name: Run mdl
uses: actionshub/markdownlint@main
with:
filesToIgnoreRegex: code\-of\-conduct\.md|CHANGELOG.md
61 changes: 30 additions & 31 deletions .github/workflows/unit_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ on: [push, pull_request]

jobs:
unit-tests:

runs-on: ubuntu-latest

defaults:
Expand All @@ -30,33 +29,33 @@ jobs:
node-version: [18.x, 20.x]

steps:
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: npm install in autoscaler-common
working-directory: src/autoscaler-common
run: npm install

- name: npm install in poller-core
working-directory: src/poller/poller-core
run: npm install

- name: poller-core unit tests
working-directory: src/poller/poller-core
run: npm test
env:
CI: true

- name: npm install in scaler-core
working-directory: src/scaler/scaler-core
run: npm install

- name: scaler-core unit tests
working-directory: src/scaler/scaler-core
run: npm test
env:
CI: true
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: npm install in autoscaler-common
working-directory: src/autoscaler-common
run: npm install

- name: npm install in poller-core
working-directory: src/poller/poller-core
run: npm install

- name: poller-core unit tests
working-directory: src/poller/poller-core
run: npm test
env:
CI: true

- name: npm install in scaler-core
working-directory: src/scaler/scaler-core
run: npm install

- name: scaler-core unit tests
working-directory: src/scaler/scaler-core
run: npm test
env:
CI: true
6 changes: 5 additions & 1 deletion .mdl.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
"MD002": false,
"MD004": { "style": "asterisk" },
"MD007": { "indent": 4 },
"MD013": { "ignore_code_blocks": true, "code_blocks": false, "tables": false },
"MD013": {
"ignore_code_blocks": true,
"code_blocks": false,
"tables": false
},
"MD029": { "style": "ordered" },
"MD030": { "ul_single": 3, "ul_multi": 3, "ol_single": 2, "ol_multi": 2 }
}
2 changes: 1 addition & 1 deletion kubernetes/decoupled/autoscaler-pkg/networkpolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
spec:
podSelector: {}
policyTypes:
- Ingress
- Ingress
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ spec:
app: otel-collector
spec:
containers:
- name: otel-collector
image: otel/opentelemetry-collector-contrib:0.93.0
args:
- --config
- /etc/otel/config.yaml
volumeMounts:
- mountPath: /etc/otel/
name: otel-config
- name: otel-collector
image: otel/opentelemetry-collector-contrib:0.93.0
args:
- --config
- /etc/otel/config.yaml
volumeMounts:
- mountPath: /etc/otel/
name: otel-config
volumes:
- name: otel-config
configMap:
name: otel-config
- name: otel-config
configMap:
name: otel-config
nodeSelector:
iam.gke.io/gke-metadata-server-enabled: "true"
serviceAccountName: otel-collector-sa
Expand Down
46 changes: 23 additions & 23 deletions kubernetes/decoupled/autoscaler-pkg/poller/poller-hourly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,30 @@ spec:
otel-submitter: "true"
spec:
containers:
- name: poller
image: poller-image # kpt-set: ${poller_image}
resources:
requests:
memory: "256Mi"
cpu: "250m"
limits:
memory: "256Mi"
env:
- name: AUTOSCALER_CONFIG
value: "/etc/autoscaler-config/autoscaler-config-hourly.yaml"
- name: K8S_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: OTLP_COLLECTOR_URL
value: "http://otel-collector:4317/"
volumeMounts:
- name: config-volume
mountPath: /etc/autoscaler-config
- name: poller
image: poller-image # kpt-set: ${poller_image}
resources:
requests:
memory: "256Mi"
cpu: "250m"
limits:
memory: "256Mi"
env:
- name: AUTOSCALER_CONFIG
value: "/etc/autoscaler-config/autoscaler-config-hourly.yaml"
- name: K8S_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: OTLP_COLLECTOR_URL
value: "http://otel-collector:4317/"
volumeMounts:
- name: config-volume
mountPath: /etc/autoscaler-config
volumes:
- name: config-volume
configMap:
name: autoscaler-config-hourly
- name: config-volume
configMap:
name: autoscaler-config-hourly
nodeSelector:
iam.gke.io/gke-metadata-server-enabled: "true"
restartPolicy: Never
Expand Down
Loading

0 comments on commit a7915ef

Please sign in to comment.