Skip to content

bump versions & fix CRDs #834

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.

Sign up for GitHub

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

Merged
jacum merged 5 commits into from
Mar 8, 2021
Merged

bump versions & fix CRDs #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a8d8df
bump versions & fix CRDs
jacum Mar 5, 2021
91e1500
Merge branch 'master' into features/version-bump-20210305
jacum Mar 5, 2021
d3e1aba
clean cache
jacum Mar 5, 2021
83c9f22
reverted scala version
jacum Mar 5, 2021
4de00e3
recipe
jacum Mar 5, 2021
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
2 changes: 1 addition & 1 deletion azure-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variables:
- name: IVY_HOME
value: $(Pipeline.Workspace)/.ivy2
- name: CACHE_RUN_ID
value: "201009"
value: "20210305"

steps:
- task: Bash@3
Expand Down
154 changes: 77 additions & 77 deletions bakery-integration-tests/src/test/resources/kubernetes/crd/crd-baker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,92 +13,31 @@ spec:
served: true
# One and only one version must be marked as the storage version.
storage: true
validation:
openAPIV3Schema:
type: object
properties:
spec:
schema:
openAPIV3Schema:
type: object
required:
- image
- recipes
properties:
image:
type: string
imagePullSecret:
type: string
serviceAccountSecret:
type: string
kafkaBootstrapServers:
type: string
replicas:
type: integer
minimum: 0
recipes:
type: array
items:
type: string
resources:
spec:
type: object
properties:
requests:
type: object
properties:
memory:
type: string
cpu:
type: string
limits:
type: object
properties:
memory:
type: string
cpu:
type: string
config:
type: string
secrets:
type: string
apiLoggingEnabled:
type: boolean
sidecar:
required:
- image
type: object
- recipes
properties:
image:
type: string
environment:
type: object
x-kubernetes-preserve-unknown-fields: true
configVolumeMountPath:
imagePullSecret:
type: string
livenessProbe:
type: object
required:
- scheme
- port
- path
properties:
scheme:
type: string
port:
type: integer
path:
type: string
readinessProbe:
type: object
required:
- scheme
- port
- path
properties:
scheme:
type: string
port:
type: integer
path:
type: string
serviceAccountSecret:
type: string
kafkaBootstrapServers:
type: string
replicas:
type: integer
minimum: 0
recipes:
type: array
items:
type: string
resources:
type: object
properties:
Expand All @@ -116,6 +55,67 @@ spec:
type: string
cpu:
type: string
config:
type: string
secrets:
type: string
apiLoggingEnabled:
type: boolean
sidecar:
required:
- image
type: object
properties:
image:
type: string
environment:
type: object
x-kubernetes-preserve-unknown-fields: true
configVolumeMountPath:
type: string
livenessProbe:
type: object
required:
- scheme
- port
- path
properties:
scheme:
type: string
port:
type: integer
path:
type: string
readinessProbe:
type: object
required:
- scheme
- port
- path
properties:
scheme:
type: string
port:
type: integer
path:
type: string
resources:
type: object
properties:
requests:
type: object
properties:
memory:
type: string
cpu:
type: string
limits:
type: object
properties:
memory:
type: string
cpu:
type: string

# either Namespaced or Cluster
scope: Namespaced
Expand Down
146 changes: 73 additions & 73 deletions bakery-integration-tests/src/test/resources/kubernetes/crd/crd-interaction.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,87 +13,87 @@ spec:
served: true
# One and only one version must be marked as the storage version.
storage: true
validation:
openAPIV3Schema:
type: object
properties:
spec:
schema:
openAPIV3Schema::
type: object
properties:
image:
type: string
imagePullSecret:
type: string
replicas:
type: integer
minimum: 1
resources:
spec:
type: object
properties:
requests:
image:
type: string
imagePullSecret:
type: string
replicas:
type: integer
minimum: 1
resources:
type: object
properties:
memory:
type: string
cpu:
type: string
limits:
type: object
properties:
memory:
type: string
cpu:
type: string
env:
type: array
items:
oneOf:
- type: object
properties:
name:
type: string
value:
type: string
required: ["name", "value"]
- type: object
properties:
name:
type: string
valueFrom:
oneOf:
- type: object
properties:
configMapKeyRef:
type: object
requests:
type: object
properties:
memory:
type: string
cpu:
type: string
limits:
type: object
properties:
memory:
type: string
cpu:
type: string
env:
type: array
items:
oneOf:
- type: object
properties:
name:
type: string
value:
type: string
required: ["name", "value"]
- type: object
properties:
name:
type: string
valueFrom:
oneOf:
- type: object
properties:
name:
type: string
key:
type: string
required: ["name", "key"]
required: ["configMapKeyRef"]
- type: object
properties:
secretKeyRef:
type: object
configMapKeyRef:
type: object
properties:
name:
type: string
key:
type: string
required: ["name", "key"]
required: ["configMapKeyRef"]
- type: object
properties:
name:
type: string
key:
type: string
required: ["name", "key"]
required: ["secretKeyRef"]
required: ["name", "valueFrom"]
configMapMounts:
type: array
items:
type: string
secretMounts:
type: array
items:
type: string
required:
- image
secretKeyRef:
type: object
properties:
name:
type: string
key:
type: string
required: ["name", "key"]
required: ["secretKeyRef"]
required: ["name", "valueFrom"]
configMapMounts:
type: array
items:
type: string
secretMounts:
type: array
items:
type: string
required:
- image
# either Namespaced or Cluster
scope: Namespaced
names:
Expand Down
2 changes: 1 addition & 1 deletion core/akka-runtime/src/main/scala/com/ing/baker/runtime/PollingAware.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ trait PollingAware extends RecipeManager with LazyLogging {
this.get(compiledRecipe.recipeId).flatMap {
maybe =>
if (maybe.isEmpty || (maybe.isDefined && maybe.get._2 < createdTime)) {
logger.info(s"Adding/updating recipe ${compiledRecipe.name} : ${compiledRecipe.recipeId}")
logger.debug(s"Adding/updating recipe ${compiledRecipe.name} : ${compiledRecipe.recipeId}")
super.put(compiledRecipe, createdTime)
} else {
Future.successful(compiledRecipe.recipeId)
Expand Down
Loading