Skip to content

Commit

Permalink
fix: sync with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@eshepelyuk
eshepelyuk committed Feb 14, 2022
1 parent c3c7647 commit 189de12
Show file tree
Hide file tree
Showing 6 changed files with 246 additions and 10 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ jobs:
run: |
helm repo add bitnami https://charts.bitnami.com/bitnami
helm install --wait pgsql bitnami/postgresql \
--set postgresqlDatabase=postgres \
--set postgresqlPassword=postgres \
--set persistence.enabled=false
--set auth.postgresPassword=postgres \
--set primary.persistence.enabled=false
- name: Setup local Docker registry
run: |
k3d registry create localhost --port 5000
Expand Down
2 changes: 1 addition & 1 deletion Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: schemahero
description: Install and configure SchemaHero in Kubernetes.
type: application
version: 0.0.0 # chart version introspected from git release tags
appVersion: 0.12.6
appVersion: 0.12.7
icon: https://raw.githubusercontent.com/schemahero/schemahero/main/artwork/color/svg/schemahero-logomark-color.svg
home: https://github.com/schemahero/schemahero-helm
maintainers:
Expand Down
199 changes: 197 additions & 2 deletions crds/databases_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0-beta.0
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: databases.databases.schemahero.io
spec:
Expand All @@ -14,7 +14,19 @@ spec:
singular: database
scope: Namespaced
versions:
- name: v1alpha4
- additionalPrinterColumns:
- jsonPath: .metadata.namespace
name: Namespace
priority: 1
type: string
- jsonPath: .spec.immediateDeploy
name: Deploy Immediately
priority: 1
type: boolean
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha4
schema:
openAPIV3Schema:
description: Database is the Schema for the databases API
Expand Down Expand Up @@ -686,6 +698,97 @@ spec:
type: object
type: object
type: object
schema:
properties:
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
required:
- key
- name
type: object
ssm:
properties:
accessKeyId:
properties:
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
required:
- key
- name
type: object
type: object
required:
- value
type: object
name:
type: string
region:
type: string
secretAccessKey:
properties:
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
required:
- key
- name
type: object
type: object
required:
- value
type: object
withDecryption:
type: boolean
required:
- name
type: object
vault:
properties:
agentInject:
type: boolean
connectionTemplate:
type: string
endpoint:
type: string
kubernetesAuthEndpoint:
type: string
role:
type: string
secret:
type: string
serviceAccount:
type: string
serviceAccountNamespace:
type: string
required:
- role
- secret
type: object
type: object
type: object
sslmode:
properties:
value:
Expand Down Expand Up @@ -1881,6 +1984,97 @@ spec:
type: object
type: object
type: object
schema:
properties:
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
required:
- key
- name
type: object
ssm:
properties:
accessKeyId:
properties:
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
required:
- key
- name
type: object
type: object
required:
- value
type: object
name:
type: string
region:
type: string
secretAccessKey:
properties:
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
required:
- key
- name
type: object
type: object
required:
- value
type: object
withDecryption:
type: boolean
required:
- name
type: object
vault:
properties:
agentInject:
type: boolean
connectionTemplate:
type: string
endpoint:
type: string
kubernetesAuthEndpoint:
type: string
role:
type: string
secret:
type: string
serviceAccount:
type: string
serviceAccountNamespace:
type: string
required:
- role
- secret
type: object
type: object
type: object
sslmode:
properties:
value:
Expand Down Expand Up @@ -2166,6 +2360,7 @@ spec:
enableShellCommand:
type: boolean
immediateDeploy:
default: false
type: boolean
schemahero:
properties:
Expand Down
31 changes: 29 additions & 2 deletions crds/migrations_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0-beta.0
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: migrations.schemas.schemahero.io
spec:
Expand All @@ -14,7 +14,24 @@ spec:
singular: migration
scope: Namespaced
versions:
- name: v1alpha4
- additionalPrinterColumns:
- jsonPath: .spec.databaseName
name: Database
type: string
- jsonPath: .spec.tableName
name: Table
type: string
- jsonPath: .metadata.namespace
name: Namespace
priority: 1
type: string
- jsonPath: .status.phase
name: Phase
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha4
schema:
openAPIV3Schema:
description: Migration is the Schema for the migrations API
Expand All @@ -34,6 +51,8 @@ spec:
spec:
description: MigrationSpec defines the desired state of Migration
properties:
databaseName:
type: string
editedDDL:
type: string
generatedDDL:
Expand All @@ -60,6 +79,13 @@ spec:
was determined to be invalid or outdated
format: int64
type: integer
phase:
enum:
- PLANNED
- APPROVED
- EXECUTED
- INVALID
type: string
plannedAt:
description: PlannedAt is the unix nano timestamp when the plan was
generated
Expand All @@ -72,6 +98,7 @@ spec:
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
Expand Down
19 changes: 17 additions & 2 deletions crds/tables_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0-beta.0
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: tables.schemas.schemahero.io
spec:
Expand All @@ -14,7 +14,21 @@ spec:
singular: table
scope: Namespaced
versions:
- name: v1alpha4
- additionalPrinterColumns:
- jsonPath: .metadata.namespace
name: Namespace
priority: 1
type: string
- jsonPath: .spec.name
name: Table
type: string
- jsonPath: .spec.database
name: Database
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha4
schema:
openAPIV3Schema:
description: Table is the Schema for the tables API
Expand Down Expand Up @@ -510,6 +524,7 @@ spec:
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
Expand Down
0 templates/statefulset.yaml → templates/manager.yaml
View file
File renamed without changes.

0 comments on commit 189de12

Please sign in to comment.