From 6bf1e0a6c0cf9c629e391aeeabf9d318c04ebd9a Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Wed, 6 Mar 2024 21:07:24 -0500 Subject: [PATCH 1/4] allow reporting that images have been uploaded for airgap installations --- templates/kotsadm-config.yaml | 3 ++- values.yaml.tmpl | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/kotsadm-config.yaml b/templates/kotsadm-config.yaml index 94c75d5..95bd9db 100644 --- a/templates/kotsadm-config.yaml +++ b/templates/kotsadm-config.yaml @@ -5,7 +5,8 @@ metadata: {{- include "admin-console.labels" . | nindent 4 }} name: kotsadm-confg data: - initial-app-images-pushed: "false" + initial-app-images-pushed: "{{ .Values.initialAppImagesPushed | quote }}" + force-original-image-names: "{{ .Values.forceOriginalImageNames | quote }}" minio-enabled-snapshots: "false" registry-is-read-only: "false" skip-preflights: {{ .Values.automation.skipPreflights | quote }} diff --git a/values.yaml.tmpl b/values.yaml.tmpl index 8aba86c..6e67a5a 100644 --- a/values.yaml.tmpl +++ b/values.yaml.tmpl @@ -24,6 +24,8 @@ automation: imagePullSecrets: [] nameOverride: "" fullnameOverride: "" +initialAppImagesPushed: false +forceOriginalImageNames: false serviceAccount: # Specifies whether a service account should be created From 766aebfd193be9fb88a8e8470bdaceb16c77dcd9 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Thu, 7 Mar 2024 00:01:38 -0500 Subject: [PATCH 2/4] if airgap, ensure that kotsadm waits for the airgap configmaps to be uploaded --- templates/kotsadm-config.yaml | 4 ++-- templates/kotsadm-default-airgap.yaml | 12 ++++++++++++ templates/kotsadm-default-license.yaml | 4 ++-- values.yaml.tmpl | 5 +++-- 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 templates/kotsadm-default-airgap.yaml diff --git a/templates/kotsadm-config.yaml b/templates/kotsadm-config.yaml index 95bd9db..36ebce0 100644 --- a/templates/kotsadm-config.yaml +++ b/templates/kotsadm-config.yaml @@ -5,8 +5,8 @@ metadata: {{- include "admin-console.labels" . | nindent 4 }} name: kotsadm-confg data: - initial-app-images-pushed: "{{ .Values.initialAppImagesPushed | quote }}" - force-original-image-names: "{{ .Values.forceOriginalImageNames | quote }}" + initial-app-images-pushed: "{{ .Values.automation.initialAppImagesPushed | quote }}" + force-original-image-names: "{{ .Values.automation.forceOriginalImageNames | quote }}" minio-enabled-snapshots: "false" registry-is-read-only: "false" skip-preflights: {{ .Values.automation.skipPreflights | quote }} diff --git a/templates/kotsadm-default-airgap.yaml b/templates/kotsadm-default-airgap.yaml new file mode 100644 index 0000000..15b60e9 --- /dev/null +++ b/templates/kotsadm-default-airgap.yaml @@ -0,0 +1,12 @@ +{{ if .Values.automation.airgap }} +apiVersion: v1 +kind: ConfigMap +metadata: + labels: + kots.io/automation: airgap + kots.io/app: {{ .Values.automation.license.slug }} + {{- include "admin-console.labels" . | nindent 4 }} + name: kotsadm-wait-for-airgap-configmaps +data: + wait-for-airgap-app: "true" +{{ end }} diff --git a/templates/kotsadm-default-license.yaml b/templates/kotsadm-default-license.yaml index ad2cc02..735a9b3 100644 --- a/templates/kotsadm-default-license.yaml +++ b/templates/kotsadm-default-license.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: annotations: - kots.io/airgap: "false" + kots.io/airgap: "{{ .Values.automation.airgap | quote }}" labels: kots.io/app: {{ .Values.automation.license.slug }} kots.io/automation: license @@ -12,4 +12,4 @@ metadata: type: Opaque data: license: {{ .Values.automation.license.data | b64enc }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/values.yaml.tmpl b/values.yaml.tmpl index 6e67a5a..282fa23 100644 --- a/values.yaml.tmpl +++ b/values.yaml.tmpl @@ -20,12 +20,13 @@ automation: appVersionLabel: "" config: values: "" + airgap: false + initialAppImagesPushed: false + forceOriginalImageNames: false imagePullSecrets: [] nameOverride: "" fullnameOverride: "" -initialAppImagesPushed: false -forceOriginalImageNames: false serviceAccount: # Specifies whether a service account should be created From a15d4785f20b57ccf6d929bd569a695aa2813622 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Thu, 7 Mar 2024 00:04:11 -0500 Subject: [PATCH 3/4] this should not be in the helm chart --- templates/kotsadm-default-airgap.yaml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 templates/kotsadm-default-airgap.yaml diff --git a/templates/kotsadm-default-airgap.yaml b/templates/kotsadm-default-airgap.yaml deleted file mode 100644 index 15b60e9..0000000 --- a/templates/kotsadm-default-airgap.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{ if .Values.automation.airgap }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - kots.io/automation: airgap - kots.io/app: {{ .Values.automation.license.slug }} - {{- include "admin-console.labels" . | nindent 4 }} - name: kotsadm-wait-for-airgap-configmaps -data: - wait-for-airgap-app: "true" -{{ end }} From 36a33289db9926df721b2c7390a38e4dedc32a36 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Thu, 7 Mar 2024 16:45:41 -0500 Subject: [PATCH 4/4] allow specifying registry --- templates/kotsadm-config.yaml | 7 ++++--- values.yaml.tmpl | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/templates/kotsadm-config.yaml b/templates/kotsadm-config.yaml index 36ebce0..b8870bc 100644 --- a/templates/kotsadm-config.yaml +++ b/templates/kotsadm-config.yaml @@ -5,12 +5,13 @@ metadata: {{- include "admin-console.labels" . | nindent 4 }} name: kotsadm-confg data: - initial-app-images-pushed: "{{ .Values.automation.initialAppImagesPushed | quote }}" - force-original-image-names: "{{ .Values.automation.forceOriginalImageNames | quote }}" minio-enabled-snapshots: "false" - registry-is-read-only: "false" skip-preflights: {{ .Values.automation.skipPreflights | quote }} with-minio: "false" {{- if .Values.automation.appVersionLabel }} app-version-label: {{ .Values.automation.appVersionLabel | quote }} {{- end }} + {{- if .Values.registry.enabled }} + registry-is-read-only: "{{ .Values.registry.readOnly | quote }}" + kotsadm-registry: "{{ .Values.registry.endpoint | quote }}" + {{- end }} diff --git a/values.yaml.tmpl b/values.yaml.tmpl index 282fa23..5032711 100644 --- a/values.yaml.tmpl +++ b/values.yaml.tmpl @@ -21,8 +21,11 @@ automation: config: values: "" airgap: false - initialAppImagesPushed: false - forceOriginalImageNames: false + +registry: + enabled: false + readOnly: false + endpoint: "" imagePullSecrets: [] nameOverride: ""