diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml index 7e72d76587..f6b7c467c1 100644 --- a/build/.goreleaser.yml +++ b/build/.goreleaser.yml @@ -100,7 +100,7 @@ archives: format: binary builds: - prom-migrator - name_template: "{{ .Binary }}_0.0.2_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}" + name_template: "{{ .Binary }}_0.0.3_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}" replacements: darwin: Darwin linux: Linux @@ -111,7 +111,7 @@ archives: format: binary builds: - jaeger-query-proxy - name_template: "{{ .Binary }}_0.0.1_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}" + name_template: "{{ .Binary }}_0.0.2_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}" replacements: darwin: Darwin linux: Linux @@ -172,7 +172,7 @@ dockers: - pkg - cmd image_templates: - - "timescale/prom-migrator:0.0.2" + - "timescale/prom-migrator:0.0.3" - "timescale/prom-migrator:latest" - ids: [] skip_push: false @@ -184,7 +184,7 @@ dockers: - pkg - cmd image_templates: - - "timescale/jaeger-query-proxy:0.0.1" + - "timescale/jaeger-query-proxy:0.0.2" - "timescale/jaeger-query-proxy:latest" diff --git a/deploy/static/deploy.yaml b/deploy/static/deploy.yaml index 8e6e988555..5649475439 100644 --- a/deploy/static/deploy.yaml +++ b/deploy/static/deploy.yaml @@ -1,4 +1,36 @@ --- +# Source: promscale/templates/service-account.yaml +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: false +metadata: + name: promscale + namespace: default + labels: + app: promscale + chart: promscale-0.7.0 + release: promscale + heritage: Helm +--- +# Source: promscale/templates/secret-connection.yaml +apiVersion: v1 +kind: Secret +metadata: + name: promscale + namespace: default + labels: + app: promscale + chart: promscale-0.7.0 + release: promscale + heritage: Helm +stringData: + PROMSCALE_DB_PORT: "5432" + PROMSCALE_DB_USER: "postgres" + PROMSCALE_DB_PASSWORD: "" + PROMSCALE_DB_HOST: "timescaledb.default.svc.cluster.local" + PROMSCALE_DB_NAME: "timescale" + PROMSCALE_DB_SSL_MODE: "require" +--- # Source: promscale/templates/svc-promscale.yaml apiVersion: v1 kind: Service @@ -7,17 +39,15 @@ metadata: namespace: default labels: app: promscale - chart: promscale-0.6.0 + chart: promscale-0.7.0 release: promscale heritage: Helm - annotations: - service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "4000" spec: selector: app: promscale - type: LoadBalancer + type: ClusterIP ports: - - name: connector-port + - name: metrics-port port: 9201 protocol: TCP --- @@ -29,7 +59,7 @@ metadata: namespace: default labels: app: promscale - chart: promscale-0.6.0 + chart: promscale-0.7.0 release: promscale heritage: Helm spec: @@ -43,33 +73,20 @@ spec: metadata: labels: app: promscale - annotations: + checksum/config: 88c801c7dcedfa1badfb9c718a5de2a2e4bacb8ba3126b7b43fc40ab0b356fc4 prometheus.io/path: /metrics prometheus.io/port: "9201" prometheus.io/scrape: "true" - spec: containers: - image: timescale/promscale imagePullPolicy: IfNotPresent name: promscale-connector + envFrom: + - secretRef: + name: promscale ports: - containerPort: 9201 - name: connector-port - env: - - name: PROMSCALE_DB_PORT - value: "5432" - - name: PROMSCALE_DB_USER - value: postgres - - name: PROMSCALE_DB_PASSWORD - valueFrom: - secretKeyRef: - name: promscale-credentials - key: PATRONI_SUPERUSER_PASSWORD - - name: PROMSCALE_DB_HOST - value: promscale.default.svc.cluster.local - - name: PROMSCALE_DB_NAME - value: timescale - - name: PROMSCALE_DB_SSL_MODE - value: require + name: metrics-port + serviceAccountName: promscale diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index 0bb7bca388..168893c145 100644 --- a/helm-chart/Chart.yaml +++ b/helm-chart/Chart.yaml @@ -1,4 +1,4 @@ name: promscale -version: 0.7.0-beta.1 +version: 0.7.0 apiVersion: v2 description: Promscale Connector deployment diff --git a/pkg/version/version.go b/pkg/version/version.go index 0b63fd3805..fd632ba921 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -38,9 +38,9 @@ var ( // It is customary to bump the version by incrementing the numeral after // the `dev` tag. The SQL migration script name must correspond to the /new/ version. - Promscale = "0.7.0-beta.1.dev.5" + Promscale = "0.7.0" PrevReleaseVersion = "0.7.0-beta.1" - PromMigrator = "0.0.2" + PromMigrator = "0.0.3" CommitHash = "" EarliestUpgradeTestVersion = "0.1.0" EarliestUpgradeTestVersionMultinode = "0.1.4" //0.1.4 earliest version that supports tsdb 2.0