Skip to content

Commit

Permalink
Update helm
Browse files Browse the repository at this point in the history
  • Loading branch information
emil-jacero committed Aug 4, 2024
1 parent 819f513 commit 63f3118
Show file tree
Hide file tree
Showing 9 changed files with 126 additions and 16 deletions.
2 changes: 1 addition & 1 deletion HELM.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
go install sigs.k8s.io/kustomize/kustomize/v5@latest
go install github.com/arttor/helmify/cmd/helmify@latest

kustomize build config/default | helmify -cert-manager-as-subchart -cert-manager-version 1.15.0 -generate-defaults -image-pull-secrets helm-charts/kode
kustomize build config/default | helmify -cert-manager-as-subchart -cert-manager-version 1.15.2 -generate-defaults -image-pull-secrets helm-charts/kode
kustomize build config/crd | helmify helm-charts/kode-crd
```
85 changes: 85 additions & 0 deletions helm-charts/kode-crd/templates/entrypoint-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,91 @@ spec:
type: object
status:
description: EntryPointStatus defines the observed state of EntryPoint
properties:
conditions:
description: Conditions represent the latest available observations
of a Kode's state.
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for direct
use as an array at the field path .status.conditions. For example,\n\n\n\ttype
FooStatus struct{\n\t // Represents the observations of a foo's
current state.\n\t // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t
\ // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
properties:
lastTransitionTime:
description: |-
lastTransitionTime is the last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: |-
message is a human readable message indicating details about the transition.
This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: |-
observedGeneration represents the .metadata.generation that the condition was set based upon.
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
with respect to the current state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: |-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
lastError:
description: LastError contains the last error message encountered during
reconciliation.
type: string
lastErrorTime:
description: LastErrorTime is the timestamp when the last error occurred.
format: date-time
type: string
phase:
description: Phase represents the current phase of the Kode resource.
type: string
required:
- phase
type: object
type: object
served: true
Expand Down
14 changes: 12 additions & 2 deletions helm-charts/kode-crd/templates/envoyproxyclusterconfig-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ spec:
spec:
description: EnvoyProxyClusterConfigSpec defines the desired state of EnvoyProxyClusterConfig
properties:
authConfig:
description: AuthConfig is custom authentication configuration. Can
be used to configure basic auth, JWT, etc.
properties:
authType:
description: AuthType is the type of authentication. Can be set
to "basic" or "jwt"
type: string
required:
- authType
type: object
clusters:
description: Clusters is a list of Envoy clusters
items:
Expand Down Expand Up @@ -149,12 +160,11 @@ spec:
type: object
type: array
image:
default: envoyproxy/envoy:v1.30-latest
default: envoyproxy/envoy:v1.31-latest
description: Image is the Docker image for the Envoy proxy
minLength: 1
type: string
required:
- httpFilters
- image
type: object
status:
Expand Down
14 changes: 12 additions & 2 deletions helm-charts/kode-crd/templates/envoyproxyconfig-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ spec:
spec:
description: EnvoyProxyConfigSpec defines the desired state of EnvoyProxyConfig
properties:
authConfig:
description: AuthConfig is custom authentication configuration. Can
be used to configure basic auth, JWT, etc.
properties:
authType:
description: AuthType is the type of authentication. Can be set
to "basic" or "jwt"
type: string
required:
- authType
type: object
clusters:
description: Clusters is a list of Envoy clusters
items:
Expand Down Expand Up @@ -148,12 +159,11 @@ spec:
type: object
type: array
image:
default: envoyproxy/envoy:v1.30-latest
default: envoyproxy/envoy:v1.31-latest
description: Image is the Docker image for the Envoy proxy
minLength: 1
type: string
required:
- httpFilters
- image
type: object
status:
Expand Down
15 changes: 10 additions & 5 deletions helm-charts/kode-crd/templates/kode-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,15 @@ spec:
- kind
- name
type: object
user:
default: abc
description: User is the HTTP Basic auth username or the user the container
should run as, abc is default.
type: string
userConfig:
description: UserConfig specifies a git repository URL to get user configuration
from.
type: string
username:
default: abc
description: Username is both the the HTTP Basic auth username (when
used) and the user the container should run as, abc is default.
type: string
workspace:
description: Workspace is the user specified workspace directory (e.g.
my-workspace).
Expand Down Expand Up @@ -501,6 +501,11 @@ spec:
description: LastErrorTime is the timestamp when the last error occurred.
format: date-time
type: string
observedGeneration:
description: ObservedGeneration is the last observed generation of the
Kode resource.
format: int64
type: integer
phase:
description: Phase represents the current phase of the Kode resource.
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: array
EnvoyConfigRef:
envoyConfigRef:
description: EnvoyConfigRef is the reference to the EnvoyProxy configuration.
properties:
kind:
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/kode-crd/templates/kodetemplate-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: array
EnvoyConfigRef:
envoyConfigRef:
description: EnvoyConfigRef is the reference to the EnvoyProxy configuration.
properties:
kind:
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/kode/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ appVersion: "PLACEHOLDER_VERSION" # This is automatically set by the GitHub Acti
dependencies:
- name: kode-crd
version: "PLACEHOLDER_VERSION" # This is automatically set by the GitHub Actions workflow
repository: "oci://ghcr.io/jacero-io"
repository: "oci://ghcr.io/jacero-io/charts"
- name: cert-manager
repository: https://charts.jetstack.io
condition: certmanager.enabled
alias: certmanager
version: "1.15.0"
version: "1.15.2"
4 changes: 2 additions & 2 deletions helm-charts/kode/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ controllerManager:
drop:
- ALL
image:
repository: ghcr.io/emil-jacero/kode-operator
tag: "PLACEHOLDER_VERSION" # This is automatically set by the GitHub Actions workflow
repository: ghcr.io/jacero.io/kode-operator
tag: latest
resources:
limits:
cpu: 500m
Expand Down

0 comments on commit 63f3118

Please sign in to comment.