Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

[CI] Update Carvel packaging and deployment scripts. #5676

Merged
merged 1 commit into from
Feb 19, 2024

Conversation

corneil
Copy link
Contributor

@corneil corneil commented Feb 13, 2024

Update to Carvel Packaging and deployment scripts. [skip ci]

@corneil corneil requested a review from jvalkeal February 13, 2024 16:49
@jvalkeal
Copy link
Contributor

Was this meant to fix generated application.yml i.e

Having /tmp/scdf-values.yml

#@data/values
---
scdf:
  server:
    image:
      tag: 2.11.2-SNAPSHOT
  skipper:
    config:
      spring:
        cloud:
          skipper:
            server:
              platform:
                kubernetes:
                  accounts:
                    default:
                      environmentVariables: 'FOO=bar'
    image:
      tag: 2.11.2-SNAPSHOT
  ctr:
    image:
      tag: 2.11.2-SNAPSHOT

Then doing:

/repos/spring/spring-cloud-dataflow/prs/src/carvel [corneil-corneil/update-carve-deploy L|✔] 
15:41 $ ytt -f config -f /tmp/scdf-values.yml

Which in this pr still outputs(doesn't preserve defaults in environmentVariables):

apiVersion: v1
kind: ConfigMap
metadata:
  name: skipper
  labels:
    app: skipper
  annotations:
    kapp.k14s.io/versioned: ""
data:
  application.yaml: |
    spring:
      cloud:
        skipper:
          server:
            platform:
              kubernetes:
                accounts:
                  default:
                    environmentVariables: FOO=bar
                    limits:
                      memory: 1024Mi
                      cpu: 500m
                    readinessProbeDelay: 30
                    livenessProbeDelay: 15
                    imagePullSecret: reg-creds
      datasource:
        testOnBorrow: true
    management:
      metrics:
        export:
          prometheus:
            enabled: true
            rsocket:
              enabled: true
              host: prometheus-rsocket-proxy
              port: 7001

@corneil
Copy link
Contributor Author

corneil commented Feb 19, 2024

There is more work needed to externalise environment variables and specific Kubernetes properties.
The values file schema shouldn't match the task and batch config put provide a separate way for providing configuration which can then be merged with defaults.

At the moment just trying to ensure the default values files don't step on the environment variables.

@corneil corneil merged commit eab323e into spring-attic:main Feb 19, 2024
@corneil corneil deleted the corneil/update-carve-deploy branch February 20, 2024 11:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants