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

Bump github.com/go-git/go-git/v5 from 5.11.0 to 5.13.0 in /deploy/pulumi #303

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Install & Cache Dependencies

runs-on: ubuntu-latest
container: docker.io/composer/composer:2
container: quay.io/kissj/php-ubi

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
stan:
name: Static Analysis
runs-on: ubuntu-latest
container: docker.io/composer/composer:2
container: quay.io/kissj/php-ubi
needs: deps
steps:

Expand All @@ -71,7 +71,7 @@ jobs:
unit:
name: Unit Tests
runs-on: ubuntu-latest
container: docker.io/composer/composer:2
container: quay.io/kissj/php-ubi
needs: deps
steps:

Expand All @@ -93,7 +93,7 @@ jobs:
lint:
name: Check PHP syntax
runs-on: ubuntu-latest
container: docker.io/composer/composer:2
container: quay.io/kissj/php-ubi
needs: deps
steps:

Expand All @@ -107,7 +107,7 @@ jobs:
# cs:
# name: CodeSniffer
# runs-on: ubuntu-latest
# container: docker.io/composer/composer:2.2.12
# container: quay.io/kissj/php-ubi
# needs: deps
# steps:
#
Expand Down
1 change: 1 addition & 0 deletions deploy/container_images/php/Containerfile-ubi
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ COPY ./composer.json /var/www/html/composer.json
COPY ./composer.lock /var/www/html/composer.lock
COPY ./src /var/www/html/src
COPY ./public /var/www/html/public
COPY ./bin /var/www/html/bin

#copy php config
COPY ./deploy/container_images/php/php.ini /etc/php.ini
Expand Down
195 changes: 195 additions & 0 deletions deploy/helm/charts/kissj/templates/cronjobs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
apiVersion: batch/v1
kind: CronJob
metadata:
name: {{ .Release.Name }}-payment-update

labels:
app.kubernetes.io/name: {{ .Chart.Name}}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
app.kubernetes.io/component: paymetnt-update
app.kubernetes.io/part-of: {{ .Chart.Name }}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
schedule: "*/5 * * * *"
concurrencyPolicy: Replace
jobTemplate:
metadata:
name: {{ .Release.Name }}-payment-update
labels:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
spec:
template:
metadata:
name: {{ .Release.Name }}-payment-update
labels:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}

spec:
restartPolicy: Never
containers:
- name: payment-update
image: {{ .Values.php.image.name }}:{{ .Values.php.image.tag }}
imagePullPolicy: Always
command: ["bin/console"]
args: ["app:update-payments"]
resources:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "256Mi"
cpu: "200m"
env:
- name: DB_TYPE
value: postgresql

- name: DATABASE_HOST
value: {{ .Release.Name }}-pgbouncer

- name: POSTGRES_DB
value: {{ .Values.postgres.dbname }}

- name: POSTGRES_USER
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-postgres
key: username

- name: POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-postgres
key: password

- name: FILE_HANDLER_TYPE
value: s3bucket

- name: S3_REGION
value: {{ .Values.app.s3.region }}

- name: S3_ENDPOINT
value: {{ .Values.app.s3.endpoint }}

- name: S3_BUCKET
value: {{ .Values.app.s3.bucket }}

- name: S3_KEY
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-s3
key: key

- name: S3_SECRET
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-s3
key: secret

- name: TEMPLATE_CACHE
value: "true"

- name: TESTING_SITE
value: {{ .Values.app.test_site | quote }}

- name: BASEPATH
value: ""

- name: DEBUG
value: {{ .Values.app.debug | quote }}

- name: DEFAULT_LOCALE
value: {{ .Values.app.locale | quote }}

- name: LOGGER_FILENAME
value: dummy

- name: LOGGER_LEVEL
value: {{ .Values.app.log_level | quote }}

- name: MAIL_DEBUG_OUTPUT_LEVEL
value: {{ .Values.app.mail.log_level | quote }}

- name: MAIL_DISABLE_TLS
value: "false"

- name: MAIL_SEND_MAIL_TO_MAIN_RECIPIENT
value: "true"

- name: MAIL_SMTP
value: "true"

- name: MAIL_SMTP_AUTH
value: "true"

- name: MAIL_DSN
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-mail
key: dsn

- name: MAIL_SMTP_USERNAME
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-mail
key: username

- name: MAIL_SMTP_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-mail
key: password

- name: MAIL_SMTP_PORT
valueFrom:
configMapKeyRef:
name: {{ .Release.Name }}-mail
key: port

- name: MAIL_SMTP_SECURE
valueFrom:
configMapKeyRef:
name: {{ .Release.Name }}-mail
key: encryption

- name: MAIL_SMTP_SERVER
valueFrom:
configMapKeyRef:
name: {{ .Release.Name }}-mail
key: server

- name: SENTRY_DSN
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-sentry-dsn
key: dsn

- name: SENTRY_PROFILING_RATE
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-sentry-dsn
key: profiling_rate

- name: SKAUTIS_USE_TEST
value: {{ .Values.app.skautis.useTest | quote }}

- name: SKAUTIS_APP_ID
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-skautis
key: appId

- name: REDIS_HOST
value: {{ .Values.app.redis.host }}

- name: REDIS_PORT
value: {{ .Values.app.redis.port | quote }}

- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-creds
key: password
32 changes: 16 additions & 16 deletions deploy/pulumi/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ replace sourcegraph.com/sourcegraph/appdash => github.com/sourcegraph/appdash v0
require (
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
Expand All @@ -30,14 +30,14 @@ require (
github.com/charmbracelet/bubbletea v0.24.2 // indirect
github.com/charmbracelet/lipgloss v0.9.1 // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudflare/circl v1.3.6 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/containerd/console v1.0.4-0.20230706203907-8f6c4e4faef5 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
github.com/djherbis/times v1.6.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/go-git/go-billy/v5 v5.6.0 // indirect
github.com/go-git/go-git/v5 v5.13.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down Expand Up @@ -70,8 +70,8 @@ require (
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -82,15 +82,15 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zclconf/go-cty v1.14.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.15.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
Expand Down
Loading
Loading