1.36.0 Release (#2013)

fix: Load variables from .env file by default

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,57 @@
+name: Bug
+description: File a bug/issue
+title: "[BUG] <title>"
+labels: ["kind/bug"]
+body:
+  - type: markdown
+    attributes:
+      value: "## Thank you for contributing to our Kompose!"
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: |
+        Briefly describe what is the desired behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual Behavior
+      description: |
+        Briefly describe what is the actual behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error or unexpected result...
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Kompose Version
+      description: |
+        Paste output of `kompose version`.
+      render: Text
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Docker-Compose file
+      description: Paste output of the `docker-compose.yaml` that you are using.
+      render: YAML
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Kubernetes Community Slack
+    url: https://kubernetes.slack.com
+    about: "Use the #kompose channel"

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,22 @@
+name: Enhancement Tracking Issue
+description: Provide supporting details for a feature in development
+labels: kind/feature
+body:
+  - type: markdown
+    attributes:
+      value: "## Thank you for contributing to our Kompose!"
+  - type: textarea
+    id: feature
+    attributes:
+      label: What would you like to be added?
+      description: |
+        Describe what feature/enhancement that you want to be added to Kompose.
+    validations:
+      required: true
+
+  - type: textarea
+    id: rationale
+    attributes:
+      label: Why is this needed?
+    validations:
+      required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+#### What type of PR is this?
+
+<!--
+Add one of the following kinds:
+/kind bug
+/kind cleanup
+/kind documentation
+/kind feature
+-->
+
+#### What this PR does / why we need it:
+
+#### Which issue(s) this PR fixes:
+<!--
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+-->
+Fixes #
+
+#### Special notes for your reviewer:

.github/dependabot.yaml

@@ -0,0 +1,22 @@
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+
+updates:
+  - commit-message:
+      include: "scope"
+      prefix: "chore(deps)"
+    directory: "/"
+    open-pull-requests-limit: 10
+    package-ecosystem: "gomod"
+    schedule:
+      interval: "daily"
+
+  - commit-message:
+      include: "scope"
+      prefix: "chore(ci)"
+    directory: "/"
+    open-pull-requests-limit: 10
+    package-ecosystem: "github-actions"
+    schedule:
+      interval: "daily"

.github/workflows/go.yml

@@ -2,9 +2,12 @@ name: Go
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
+env:
+  # Avoid noisy outputs like "tput: No value for $TERM and no -T specified"
+  TERM: dumb
 
 jobs:
 
@@ -14,21 +17,19 @@ jobs:
     steps:
 
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: ^1.13
+        go-version: ^1.21
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Build
       run: make bin
 
-    - name: Test
-      run: make test
-      
     - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v2.1.4
-      with: 
+      uses: actions/upload-artifact@v4
+      with:
+        name: "kompose"
         path: "kompose"

.github/workflows/golangci-lint.yml

@@ -1,15 +0,0 @@
-name: golangci-lint
-on:
-  pull_request:
-jobs:
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.32.2
-          args: --timeout 5m

.github/workflows/lint.yml

@@ -0,0 +1,19 @@
+name: lint
+on:
+  pull_request:
+jobs:
+  lint:
+    strategy:
+      matrix:
+        go: [1.21, 1.22]
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+      - name: "Install golang"
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go }}
+      - name: "Run go vet"
+        run: "go vet ./pkg/..."

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: Kompose CI
 on:
   push:
     branches:
-      - master
+      - main 
   pull_request:
 env:
   # Avoid noisy outputs like "tput: No value for $TERM and no -T specified"
@@ -10,16 +10,18 @@ env:
 jobs:
   test:
     name: Test with ${{ matrix.go }} and CROSS_COMPILE=${{ matrix.cross_compile }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [1.13, 1.14]
+        go: [1.21, 1.22]
         cross_compile: [true, false]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
+      - name: Install dyff
+        run: go install github.com/homeport/dyff/cmd/dyff@v1.5.8
       - name: Run tests
         run: make test
       - name: Perform cross compile
@@ -27,13 +29,15 @@ jobs:
         run: make cross
   docs:
     name: Build docs and Coveralls integration
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: test
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.14
+          go-version: ^1.21
+      - name: Install dyff
+        run: go install github.com/homeport/dyff/cmd/dyff@v1.5.8
       - name: Create .coverprofile for each targeted directory by re:running tests
         run: make test
       - name: Collect all .coverprofile files and save it to one file gover.coverprofile
@@ -43,5 +47,3 @@ jobs:
         env:
           # As per https://github.com/mattn/goveralls#github-actions
           COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./script/sync-docs.sh
-        if: ${{ github.ref == 'refs/heads/master' }}

.gitignore

@@ -7,8 +7,18 @@ kompose
 bin
 /docker-compose.yaml
 /docker-compose.yml
+/compose.yaml
+/compose.yml
 changes.txt
 
+# Ignore site documents / when switching branches
+docs/_site/
+docs/.jekyll-cache/
+docs/.git/
+docs/.gitignore
+_site/
+.jekyll-cache/
+
 #
 # GO SPECIFIC
 #
@@ -64,3 +74,14 @@ tags
 
 # IntelliJ IDE specific
 .idea
+
+.DS_Store
+
+# VSCode specific
+.vscode
+
+# Client Test generated files
+client/testdata/generated
+
+
+pkg/mod

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "build/rpm"]
-	path = build/rpm
-	url = https://src.fedoraproject.org/rpms/kompose

.golangci.yml

@@ -12,7 +12,7 @@ linters:
 #    - errcheck
 #    - goconst
     - goimports
-#    - golint
+#    - staticcheck
     - goprintffuncname
 #    - gosimple
     - govet

.openvex/templates/README.md

@@ -0,0 +1,27 @@
+# OpenVEX Templates Directory
+
+This directory contains the OpenVEX data for this repository.
+The files stored in this directory are used as templates by
+`vexctl generate` when generating VEX data for a release or 
+a specific artifact.
+
+To add new statements to publish data about a vulnerability,
+download [vexctl](https://github.com/openvex/vexctl)
+and append new statements using `vexctl add`. For example:
+```
+vexctl add --in-place main.openvex.json pkg:oci/test CVE-2014-1234567 fixed
+```
+That will add a new VEX statement expressing that the impact of
+CVE-2014-1234567 is under investigation in the test image. When
+cutting a new release, for `pkg:oci/test` the new file will be
+incorporated to the relase's VEX data.
+
+## Read more about OpenVEX
+
+To know more about generating, publishing and using VEX data
+in your project, please check out the vexctl repository and
+documentation: https://github.com/openvex/vexctl
+
+OpenVEX also has an examples repository with samples and docs:
+https://github.com/openvex/examples
+

.openvex/templates/main.openvex.json

@@ -0,0 +1,8 @@
+{
+  "@context": "https://openvex.dev/ns/v0.2.0",
+  "@id": "https://openvex.dev/docs/public/vex-6f9001fd8630edd2996df09f345882066d7b5bf512e54af918343d278640ecd0",
+  "author": "vexctl (automated template)",
+  "timestamp": "2023-12-15T19:10:43.910365Z",
+  "version": 1,
+  "statements": []
+}

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-added-large-files
+  - repo: https://github.com/dnephin/pre-commit-golang
+    rev: v0.5.1
+    hooks:
+      - id: go-fmt
+      - id: go-imports
+      - id: golangci-lint
+      - id: go-unit-tests
+  - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
+    rev: v9.18.0
+    hooks:
+      - id: commitlint
+        stages: [commit-msg]
+        additional_dependencies: ["@commitlint/config-conventional"]

CONTRIBUTING.md

@@ -8,8 +8,8 @@ We'd love to accept your patches! Before we can take them, we have to jump a cou
 
 Please fill out either the individual or corporate Contributor License Agreement (CLA).
 
-  * If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an individual CLA.
-  * If you work for a company that wants to allow you to contribute your work, then you'll need to sign a corporate CLA.
+- If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an individual CLA.
+- If you work for a company that wants to allow you to contribute your work, then you'll need to sign a corporate CLA.
 
 Contact one of the [OWNERS](OWNERS) on Slack to access the appropriate CLA and instructions for how to sign and return it. Once we receive it, we'll be able to accept your pull requests.
 

Dockerfile

@@ -1,10 +1,17 @@
-FROM alpine:3.9 as builder
+# Alpine Builder
+FROM alpine AS builder
 
 RUN apk add --no-cache curl
 COPY ./build/VERSION VERSION
-RUN version=$(cat VERSION) && curl -L "https://github.com/kubernetes/kompose/releases/download/v${version}/kompose-linux-amd64" -o kompose
+RUN \
+  version=$(cat VERSION) && \
+  ARCH=$(uname -m | sed 's/armv7l/arm/g' | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') && \
+  curl -L \
+    "https://github.com/kubernetes/kompose/releases/download/v${version}/kompose-linux-${ARCH}" \
+    -o kompose && \
+  chmod +x kompose
 
-FROM alpine:3.9
+# Runtime
+FROM alpine
 
 COPY --from=builder /kompose /usr/bin/kompose
-RUN chmod +x /usr/bin/kompose

Makefile

@@ -18,6 +18,20 @@ GITCOMMIT := $(shell git rev-parse --short HEAD)
 BUILD_FLAGS := -ldflags="-w -s -X github.com/kubernetes/kompose/pkg/version.GITCOMMIT=$(GITCOMMIT)"
 TEST_IMAGE := kompose/tests:latest
 
+# go-get-tool will 'go get' any package $2 and install it to $1.
+PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+define go-get-tool
+@[ -f $(1) ] || { \
+set -e ;\
+TMP_DIR=$$(mktemp -d) ;\
+cd $$TMP_DIR ;\
+go mod init tmp ;\
+echo "Downloading $(2)" ;\
+GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+rm -rf $$TMP_DIR ;\
+}
+endef
+
 default: bin
 
 .PHONY: all
@@ -37,8 +51,9 @@ cross:
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build  ${BUILD_FLAGS} -installsuffix cgo  -o "bin/kompose-linux-amd64" main.go
 	GOOS=linux GOARCH=arm CGO_ENABLED=0 GO111MODULE=on go build  ${BUILD_FLAGS} -installsuffix cgo  -o "bin/kompose-linux-arm" main.go
 	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 GO111MODULE=on go build  ${BUILD_FLAGS} -installsuffix cgo  -o "bin/kompose-linux-arm64" main.go
-	GOOS=windows GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build  ${BUILD_FLAGS} -installsuffix cgo  -o "bin/kompose-windows-amd64" main.go
+	GOOS=windows GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build  ${BUILD_FLAGS} -installsuffix cgo  -o "bin/kompose-windows-amd64.exe" main.go
 	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build  ${BUILD_FLAGS} -installsuffix cgo  -o "bin/kompose-darwin-amd64" main.go
+	GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 GO111MODULE=on go build  ${BUILD_FLAGS} -installsuffix cgo  -o "bin/kompose-darwin-arm64" main.go
 
 .PHONY: clean
 clean:
@@ -67,25 +82,16 @@ test-openshift:
 # run commandline tests
 .PHONY: test-cmd
 test-cmd:
-	./script/test/cmd/tests_new.sh
-
-# generate commandline tests
-.PHONY: gen-cmd
-gen-cmd:
-	./script/test/cmd/make-test.sh
+	./script/test/cmd/tests.sh
 
 # run all validation tests
 .PHONY: validate
-validate: gofmt vet lint
+validate: gofmt vet
 
 .PHONY: vet
 vet:
 	go vet ./pkg/...
 
-.PHONY: lint
-lint:
-	golint ./pkg/...
-
 .PHONY: gofmt
 gofmt:
 	./script/check-gofmt.sh
@@ -97,10 +103,9 @@ test: bin test-dep  validate test-unit-cover install test-cmd
 # Install all the required test-dependencies before executing tests (only valid when running `make test`)
 .PHONY: test-dep
 test-dep:
-	go get github.com/mattn/goveralls
-	go get github.com/modocache/gover
-	go get golang.org/x/lint/golint
-	go get github.com/mitchellh/gox
+	go install github.com/mattn/goveralls@latest
+	go install github.com/modocache/gover@latest
+	go install github.com/mitchellh/gox@latest
 
 
 # build docker image that is used for running all test locally
@@ -118,6 +123,17 @@ test-container:
 test-k8s:
 	./script/test_k8s/test.sh
 
+GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
+.PHONY: install-golangci-lint
+install-golangci-lint:
+# golangci-lint version must consistent with github CI
+# ref: ./.github/workflows/golangci-lint.yml
+	$(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.32.2)
+
 .PHONY: golangci-lint
-golangci-lint:
-	golangci-lint run -c .golangci.yml
+golangci-lint: install-golangci-lint
+	$(GOLANGCI_LINT) run -c .golangci.yml --timeout 5m
+
+.PHONY: test-client
+test-client: 
+	go test ./client/...

OWNERS

@@ -3,18 +3,10 @@
 
 reviewers:
   - cdrage
-  - janetkuo
-  - kadel 
-  - ngtuna
-  - sebgoa
-  - surajssd
   - hangyan
+  - TessaIO
 
 approvers:
   - cdrage
-  - janetkuo
-  - kadel 
-  - ngtuna
-  - sebgoa
-  - surajssd
   - hangyan
+  - TessaIO

README.md

@@ -2,22 +2,24 @@
 
 [![Build Status Widget]][Build Status] [![Coverage Status Widget]][Coverage Status] [![GoDoc Widget]][GoDoc]  [![GoReportCard Widget]][GoReportCardResult]
 
-`kompose` is a tool to help users who are familiar with `docker-compose` move to [Kubernetes](http://kubernetes.io). `kompose` takes a Docker Compose file and translates it into Kubernetes resources.
+![logo](/docs/assets/images/logo.png)
 
-`kompose` is a convenience tool to go from local Docker development to managing your application with Kubernetes. Transformation of the Docker Compose format to Kubernetes resources manifest may not be exact, but it helps tremendously when first deploying an application on Kubernetes.
+`kompose` is a tool to help users who are familiar with `docker-compose` move to [Kubernetes](http://kubernetes.io). `kompose` takes a [Compose Specification](https://compose-spec.io/) file and translates it into Kubernetes resources.
+
+`kompose` is a convenience tool to go from local Compose environment to managing your application with Kubernetes. Transformation of the [Compose Specification](https://compose-spec.io/) format to Kubernetes resources manifest may not be exact, but it helps tremendously when first deploying an application on Kubernetes.
 
 ## Use Case
 
-Convert [`docker-compose.yaml`](https://raw.githubusercontent.com/kubernetes/kompose/master/examples/docker-compose.yaml) into Kubernetes deployments and services with one simple command:
+Convert [`compose.yaml`](https://raw.githubusercontent.com/kubernetes/kompose/main/examples/compose.yaml) into Kubernetes deployments and services with one simple command:
 
 ```sh
-$ kompose convert -f docker-compose.yaml
-INFO Kubernetes file "frontend-service.yaml" created         
-INFO Kubernetes file "redis-master-service.yaml" created     
-INFO Kubernetes file "redis-slave-service.yaml" created      
-INFO Kubernetes file "frontend-deployment.yaml" created      
-INFO Kubernetes file "redis-master-deployment.yaml" created  
-INFO Kubernetes file "redis-slave-deployment.yaml" created 
+$ kompose convert -f compose.yaml
+INFO Kubernetes file "frontend-service.yaml" created
+INFO Kubernetes file "redis-leader-service.yaml" created
+INFO Kubernetes file "redis-replica-service.yaml" created
+INFO Kubernetes file "frontend-deployment.yaml" created
+INFO Kubernetes file "redis-leader-deployment.yaml" created
+INFO Kubernetes file "redis-replica-deployment.yaml" created
 ```
 
 Other examples are provided in the _examples_ [directory](./examples).
@@ -29,34 +31,36 @@ We have multiple ways to install Kompose. Our preferred method is downloading th
 Our entire list of installation methods are located in our [installation.md](/docs/installation.md) document.
 
 Installation methods:
-  - [Binary (Preferred method)](/docs/installation.md#github-release)
-  - [Go](/docs/installation.md#go)
-  - [CentOS](/docs/installation.md#centos)
-  - [Fedora](/docs/installation.md#fedora)
-  - [openSUSE/SLE](/docs/installation.md#opensusesle)
-  - [macOS (Homebrew and MacPorts)](/docs/installation.md#macos)
-  - [Windows](/docs/installation.md#windows)
+
+- [Binary (Preferred method)](/docs/installation.md#github-release)
+- [Go](/docs/installation.md#go)
+- [CentOS](/docs/installation.md#centos)
+- [openSUSE/SLE](/docs/installation.md#opensusesle)
+- [NixOS](/docs/installation.md#nixos)
+- [macOS (Homebrew and MacPorts)](/docs/installation.md#macos)
+- [Windows](/docs/installation.md#windows)
+- [Docker](/docs/installation.md#docker)
 
 #### Binary installation
 
 Kompose is released via GitHub on a three-week cycle, you can see all current releases on the [GitHub release page](https://github.com/kubernetes/kompose/releases).
 
-__Linux and macOS:__
+**Linux and macOS:**
 
 ```sh
 # Linux
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.24.0/kompose-linux-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.36.0/kompose-linux-amd64 -o kompose
 
 # macOS
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.24.0/kompose-darwin-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.36.0/kompose-darwin-amd64 -o kompose
 
 chmod +x kompose
 sudo mv ./kompose /usr/local/bin/kompose
 ```
 
-__Windows:__
+**Windows:**
 
-Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.24.0/kompose-windows-amd64.exe) and add the binary to your PATH.
+Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.36.0/kompose-windows-amd64.exe) and add the binary to your PATH.
 
 ## Shell autocompletion
 
@@ -76,32 +80,48 @@ kompose completion fish | source
 ## Development and building of Kompose
 
 ### Building with `go`
-__Requisites:__
+
+**Requisites:**
+
 1. [make](https://www.gnu.org/software/make/)
 2. [Golang](https://golang.org/) v1.6 or later
 3. Set `GOPATH` correctly or click [SettingGOPATH](https://github.com/golang/go/wiki/SettingGOPATH) for details
 
-__Steps:__
+**Steps:**
+
 1. Clone repository
+
 ```console
 $ git clone https://github.com/kubernetes/kompose.git $GOPATH/src/github.com/kubernetes/kompose
 ```
-2. Build with `make`
+
+2. Change directory to the cloned repo.
+
+```console
+cd $GOPATH/src/github.com/kubernetes/kompose
+```
+
+3. Build with `make`
+
 ```console
 $ make bin
 ```
-3. Or build with `go`
+
+4. Or build with `go`
+
 ```console
 $ go build -o kompose main.go
 ```
-4. Test your changes
+
+5. Test your changes
+
 ```console
 $ make test
 ```
 
 ## Documentation
 
-Documentation can be found at our [kompose.io](http://kompose.io) website or our [docs](https://github.com/kubernetes/kompose/tree/master/docs) folder.
+Documentation can be found at our [kompose.io](http://kompose.io) website or our [docs](https://github.com/kubernetes/kompose/tree/main/docs) folder.
 
 Here is a list of all available docs:
 
@@ -114,12 +134,11 @@ Here is a list of all available docs:
 
 ## Community, Discussion, Contribution, and Support
 
-__Issues:__ If you find any issues, please [file it](https://github.com/kubernetes/kompose/issues).
+**Issues:** If you find any issues, please [file it](https://github.com/kubernetes/kompose/issues).
 
-__Kubernetes Community:__ As part of the Kubernetes ecosystem, we follow the Kubernetes community principles. More information can be found on the [community page](http://kubernetes.io/community/).
-
-__Chat (Slack):__ We're fairly active on [Slack](http://slack.kubernetes.io#kompose) and you can find us in the #kompose channel.
+**Kubernetes Community:** As part of the Kubernetes ecosystem, we follow the Kubernetes community principles. More information can be found on the [community page](http://kubernetes.io/community/).
 
+**Chat (Slack):** We're fairly active on [Slack](http://slack.kubernetes.io#kompose) and you can find us in the #kompose channel.
 
 ### Code of Conduct
 
@@ -129,7 +148,7 @@ Participation in the Kubernetes community is governed by the [Kubernetes Code of
 [Build Status Widget]: https://github.com/kubernetes/kompose/workflows/Kompose%20CI/badge.svg
 [GoDoc]: https://godoc.org/github.com/kubernetes/kompose
 [GoDoc Widget]: https://godoc.org/github.com/kubernetes/kompose?status.svg
-[Coverage Status Widget]: https://coveralls.io/repos/github/kubernetes/kompose/badge.svg?branch=master
-[Coverage Status]: https://coveralls.io/github/kubernetes/kompose?branch=master
+[Coverage Status Widget]: https://coveralls.io/repos/github/kubernetes/kompose/badge.svg?branch=main
+[Coverage Status]: https://coveralls.io/github/kubernetes/kompose?branch=main
 [GoReportCard Widget]: https://goreportcard.com/badge/github.com/kubernetes/kompose
 [GoReportCardResult]: https://goreportcard.com/report/github.com/kubernetes/kompose

RELEASE.md

@@ -5,4 +5,4 @@ The process is as follows:
 1. A PR proposing a new release with a changelog since the last release
 1. At least 2 or more [OWNERS](OWNERS) must LGTM this release
 1. The release PR is closed
-1. An OWNER runs `git tag -s $VERSION` and inserts the changelog and pushes the tag with `git push $VERSION`
+1. An OWNER runs `git tag -s $VERSION` and inserts the changelog and pushes the tag with `git push $VERSION`

SECURITY_CONTACTS

@@ -13,7 +13,7 @@
 cdrage
 kadel
 hangyan
-surajssd
 janetkuo
 ngtuna
 sebgoa
+AhmedGrati

build/README.md

@@ -2,18 +2,20 @@
 
 There are instructions on how to build the RPM.
 
-# 1.  Gofed
+# 1. Gofed
 
 Grab gofed from https://github.com/gofed/gofed
 
 Choose which version of the repo you want to build. For kompose it was 0.3.0 and the commit was 135165b39c55d29a5426479ded81eddd56bfbaf4
 
 Run the following to generate spec file:
+
 ```sh
 gofed repo2spec --detect github.com/kubernetes/kompose --commit 135165b39c55d29a5426479ded81eddd56bfbaf4 --with-extra --with-build -f
 ```
 
 The spec file is now located at:
+
 ```sh
 $HOME/gofed/golang-github-kubernetes-incubator-kompose/golang-github-kubernetes-incubator-kompose.spec
 ```
@@ -25,13 +27,13 @@ Now we need to go through and fix some things.
 Generate bundled dependencies by using parsedeps.go
 
 Go to the kompose source folder and then run:
+
 ```sh
 go run parsedeps.go
 ```
 
 In the future this will possibly done by `gofed`, see: https://github.com/gofed/gofed/issues/42
 
-
 # 3. Building a source RPM locally on CentOS
 
 First, follow instructions to do local setup https://wiki.centos.org/HowTos/SetupRpmBuildEnvironment
@@ -45,6 +47,7 @@ Copy the kompose code directory with name `kompose-135165b39c55d29a5426479ded81e
 Tar the `kompose-135165b39c55d29a5426479ded81eddd56bfbaf4` code directory as `kompose-135165b.tar.gz` and copy it to `$HOME/rpmbuild/SOURCES/`
 
 Run following command:
+
 ```sh
 rpmbuild -ba kompose.spec
 ```
@@ -54,6 +57,7 @@ Find the srpm in `$HOME/rpmbuild/SRPMS`
 Find the RPM in `$HOME/rpmbuild/RPM/arch/`
 
 Check that the dependencies are proper:
+
 ```sh
 rpm -qpR RPMS/x86_64/kompose-0.3.0-0.1.git135165b.el7.centos.x86_64.rpm
 ```
@@ -63,12 +67,14 @@ rpm -qpR RPMS/x86_64/kompose-0.3.0-0.1.git135165b.el7.centos.x86_64.rpm
 First, setup your environment in order to run Koji: https://fedoraproject.org/wiki/Using_the_Koji_build_system
 
 Example setup:
+
 ```sh
 fedora-packager-setup
 kinit <username>@FEDORAPROJECT.ORG
 ```
 
 To build it on koji run:
+
 ```
 koji build --scratch rawhide kompose-0.3.0-0.1.git135165b.el7.centos.src.rpm
 ```

build/VERSION

@@ -1 +1 @@
-1.24.0
+1.36.0

build/rpm

@@ -1 +0,0 @@
-Subproject commit e6948b607f90bb2ef8fdc97075fc4c6cc73e6063

client/client.go

@@ -0,0 +1,21 @@
+package client
+
+type Kompose struct {
+	suppressWarnings bool
+	verbose          bool
+	errorOnWarning   bool
+}
+
+func NewClient(opts ...Opt) (*Kompose, error) {
+	k := &Kompose{
+		suppressWarnings: false,
+		verbose:          false,
+		errorOnWarning:   false,
+	}
+	for _, op := range opts {
+		if err := op(k); err != nil {
+			return nil, err
+		}
+	}
+	return k, nil
+}

client/convert.go

@@ -0,0 +1,249 @@
+package client
+
+import (
+	"fmt"
+
+	"github.com/kubernetes/kompose/pkg/app"
+	"github.com/kubernetes/kompose/pkg/kobject"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func (k *Kompose) Convert(options ConvertOptions) ([]runtime.Object, error) {
+	options = k.setDefaultValues(options)
+	err := k.validateOptions(options)
+	if err != nil {
+		return nil, err
+	}
+	kobjectConvertOptions := kobject.ConvertOptions{
+		ToStdout:                    options.ToStdout,
+		CreateChart:                 k.createChart(options),
+		GenerateYaml:                true,
+		GenerateJSON:                options.GenerateJson,
+		Replicas:                    *options.Replicas,
+		InputFiles:                  options.InputFiles,
+		OutFile:                     options.OutFile,
+		Provider:                    k.getProvider(options),
+		CreateD:                     k.createDeployment(options),
+		CreateDS:                    k.createDaemonSet(options),
+		CreateRC:                    k.createReplicationController(options),
+		Build:                       *options.Build,
+		BuildRepo:                   k.buildRepo(options),
+		BuildBranch:                 k.buildBranch(options),
+		PushImage:                   options.PushImage,
+		PushImageRegistry:           options.PushImageRegistry,
+		CreateDeploymentConfig:      k.createDeploymentConfig(options),
+		EmptyVols:                   false,
+		Profiles:                    options.Profiles,
+		Volumes:                     *options.VolumeType,
+		PVCRequestSize:              options.PvcRequestSize,
+		InsecureRepository:          k.insecureRepository(options),
+		IsDeploymentFlag:            k.createDeployment(options),
+		IsDaemonSetFlag:             k.createDaemonSet(options),
+		IsReplicationControllerFlag: k.createReplicationController(options),
+		Controller:                  k.getController(options),
+		IsReplicaSetFlag:            *options.Replicas != 0,
+		IsDeploymentConfigFlag:      k.createDeploymentConfig(options),
+		YAMLIndent:                  2,
+		WithKomposeAnnotation:       *options.WithKomposeAnnotations,
+		MultipleContainerMode:       k.multiContainerMode(options),
+		ServiceGroupMode:            k.serviceGroupMode(options),
+		ServiceGroupName:            k.serviceGroupName(options),
+		SecretsAsFiles:              k.secretsAsFiles(options),
+		GenerateNetworkPolicies:     options.GenerateNetworkPolicies,
+	}
+	err = app.ValidateComposeFile(&kobjectConvertOptions)
+	if err != nil {
+		return nil, err
+	}
+	objects, err := app.Convert(kobjectConvertOptions)
+	return objects, err
+}
+
+func (k *Kompose) setDefaultValues(options ConvertOptions) ConvertOptions {
+	replicasDefaultValue := 1
+	buildDefaultValue := "none"
+	volumeTypeDefaultValue := "persistentVolumeClaim"
+	withKomposeAnnotationsDefaultValue := true
+	kubernetesControllerDefaultValue := ""
+	kubernetesServiceGroupModeDefaultValue := ""
+
+	if options.Replicas == nil {
+		options.Replicas = &replicasDefaultValue
+	}
+	if options.Build == nil {
+		options.Build = &buildDefaultValue
+	}
+	if options.VolumeType == nil {
+		options.VolumeType = &volumeTypeDefaultValue
+	}
+	if options.WithKomposeAnnotations == nil {
+		options.WithKomposeAnnotations = &withKomposeAnnotationsDefaultValue
+	}
+	if options.Provider == nil {
+		options.Provider = Kubernetes{
+			Controller: &kubernetesControllerDefaultValue,
+		}
+	}
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		if kubernetesProvider.Controller == nil {
+			options.Provider = Kubernetes{
+				Controller:         &kubernetesControllerDefaultValue,
+				Chart:              options.Provider.(Kubernetes).Chart,
+				MultiContainerMode: options.Provider.(Kubernetes).MultiContainerMode,
+				ServiceGroupMode:   options.Provider.(Kubernetes).ServiceGroupMode,
+				ServiceGroupName:   options.Provider.(Kubernetes).ServiceGroupName,
+				SecretsAsFiles:     options.Provider.(Kubernetes).SecretsAsFiles,
+			}
+		}
+		if kubernetesProvider.ServiceGroupMode == nil {
+			options.Provider = Kubernetes{
+				Controller:         options.Provider.(Kubernetes).Controller,
+				Chart:              options.Provider.(Kubernetes).Chart,
+				MultiContainerMode: options.Provider.(Kubernetes).MultiContainerMode,
+				ServiceGroupMode:   &kubernetesServiceGroupModeDefaultValue,
+				ServiceGroupName:   options.Provider.(Kubernetes).ServiceGroupName,
+				SecretsAsFiles:     options.Provider.(Kubernetes).SecretsAsFiles,
+			}
+		}
+	}
+	return options
+}
+
+func (k *Kompose) validateOptions(options ConvertOptions) error {
+	build := options.Build
+	if *build != string(LOCAL) && *build != string(BUILD_CONFIG) && *build != string(NONE) {
+		return fmt.Errorf(
+			"unexpected Value for Build field. Possible values are: %v, %v, and %v", string(LOCAL), string(BUILD_CONFIG), string(NONE),
+		)
+	}
+
+	volumeType := options.VolumeType
+	if *volumeType != string(PVC) && *volumeType != string(EMPTYDIR) && *volumeType != string(HOSTPATH) && *volumeType != string(CONFIGMAP) {
+		return fmt.Errorf(
+			"unexpected Value for VolumeType field. Possible values are: %v, %v, %v, %v", string(PVC), string(EMPTYDIR), string(HOSTPATH), string(CONFIGMAP),
+		)
+	}
+
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		kubernetesController := kubernetesProvider.Controller
+		if *kubernetesController != "" && *kubernetesController != string(DEPLOYMENT) && *kubernetesController != string(DAEMONSET) && *kubernetesController != string(REPLICATION_CONTROLLER) {
+			return fmt.Errorf(
+				"unexpected Value for Kubernetes Controller field. Possible values are: %v, %v, and %v", string(DEPLOYMENT), string(DAEMONSET), string(REPLICATION_CONTROLLER),
+			)
+		}
+
+		kubernetesServiceGroupMode := kubernetesProvider.ServiceGroupMode
+		if *kubernetesServiceGroupMode != string(LABEL) && *kubernetesServiceGroupMode != string(VOLUME) && *kubernetesServiceGroupMode != "" {
+			return fmt.Errorf(
+				"unexpected Value for Kubernetes Service Groupe Mode field. Possible values are: %v, %v, ''", string(LABEL), string(VOLUME),
+			)
+		}
+
+		if *build == string(BUILD_CONFIG) {
+			return fmt.Errorf("the build value %v is only supported for Openshift provider", string(BUILD_CONFIG))
+		}
+	}
+
+	return nil
+}
+
+func (k *Kompose) createDeployment(options ConvertOptions) bool {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return *kubernetesProvider.Controller == string(DEPLOYMENT)
+	}
+	return false
+}
+
+func (k *Kompose) createDaemonSet(options ConvertOptions) bool {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return *kubernetesProvider.Controller == string(DAEMONSET)
+	}
+	return false
+}
+
+func (k *Kompose) createReplicationController(options ConvertOptions) bool {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return *kubernetesProvider.Controller == string(REPLICATION_CONTROLLER)
+	}
+	return false
+}
+
+func (k *Kompose) createChart(options ConvertOptions) bool {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return kubernetesProvider.Chart
+	}
+	return false
+}
+
+func (k *Kompose) multiContainerMode(options ConvertOptions) bool {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return kubernetesProvider.MultiContainerMode
+	}
+	return false
+}
+
+func (k *Kompose) serviceGroupMode(options ConvertOptions) string {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return *kubernetesProvider.ServiceGroupMode
+	}
+	return ""
+}
+
+func (k *Kompose) serviceGroupName(options ConvertOptions) string {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return kubernetesProvider.ServiceGroupName
+	}
+	return ""
+}
+
+func (k *Kompose) secretsAsFiles(options ConvertOptions) bool {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return kubernetesProvider.SecretsAsFiles
+	}
+	return false
+}
+
+func (k *Kompose) createDeploymentConfig(options ConvertOptions) bool {
+	if _, ok := options.Provider.(Openshift); ok {
+		return true
+	}
+	return false
+}
+
+func (k *Kompose) insecureRepository(options ConvertOptions) bool {
+	if openshiftProvider, ok := options.Provider.(Openshift); ok {
+		return openshiftProvider.InsecureRepository
+	}
+	return false
+}
+
+func (k *Kompose) buildRepo(options ConvertOptions) string {
+	if openshiftProvider, ok := options.Provider.(Openshift); ok {
+		return openshiftProvider.BuildRepo
+	}
+	return ""
+}
+
+func (k *Kompose) buildBranch(options ConvertOptions) string {
+	if openshiftProvider, ok := options.Provider.(Openshift); ok {
+		return openshiftProvider.BuildRepo
+	}
+	return ""
+}
+
+func (k *Kompose) getProvider(options ConvertOptions) string {
+	if _, ok := options.Provider.(Openshift); ok {
+		return "openshift"
+	}
+	if _, ok := options.Provider.(Kubernetes); ok {
+		return "kubernetes"
+	}
+	return "kubernetes"
+}
+
+func (k *Kompose) getController(options ConvertOptions) string {
+	if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
+		return *kubernetesProvider.Controller
+	}
+	return ""
+}

client/convert_test.go

@@ -0,0 +1,171 @@
+package client
+
+import (
+	"fmt"
+	v1 "k8s.io/api/core/v1"
+	"sort"
+	"testing"
+
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
+	appsv1 "k8s.io/api/apps/v1"
+)
+
+func TestConvertError(t *testing.T) {
+	randomBuildValue := "random-build"
+	randomVolumeTypeValue := "random-volume-type"
+	randomKubernetesControllerValue := "random-controller"
+	randomKubernetesServiceGroupModeValue := "random-group-mode"
+	buildConfigValue := string(BUILD_CONFIG)
+	testCases := []struct {
+		options      ConvertOptions
+		errorMessage string
+	}{
+		{
+			options: ConvertOptions{
+				Build: &randomBuildValue,
+			},
+			errorMessage: fmt.Sprintf("unexpected Value for Build field. Possible values are: %v, %v, and %v", string(LOCAL), string(BUILD_CONFIG), string(NONE)),
+		},
+		{
+			options: ConvertOptions{
+				VolumeType: &randomVolumeTypeValue,
+			},
+			errorMessage: fmt.Sprintf("unexpected Value for VolumeType field. Possible values are: %v, %v, %v, %v", string(PVC), string(EMPTYDIR), string(HOSTPATH), string(CONFIGMAP)),
+		},
+		{
+			options: ConvertOptions{
+				Provider: Kubernetes{
+					Controller: &randomKubernetesControllerValue,
+				},
+			},
+			errorMessage: fmt.Sprintf("unexpected Value for Kubernetes Controller field. Possible values are: %v, %v, and %v", string(DEPLOYMENT), string(DAEMONSET), string(REPLICATION_CONTROLLER)),
+		},
+		{
+			options: ConvertOptions{
+				Provider: Kubernetes{
+					ServiceGroupMode: &randomKubernetesServiceGroupModeValue,
+				},
+			},
+			errorMessage: fmt.Sprintf("unexpected Value for Kubernetes Service Groupe Mode field. Possible values are: %v, %v, ''", string(LABEL), string(VOLUME)),
+		},
+		{
+			options: ConvertOptions{
+				Provider: Kubernetes{},
+				Build:    &buildConfigValue,
+			},
+			errorMessage: fmt.Sprintf("the build value %v is only supported for Openshift provider", string(BUILD_CONFIG)),
+		},
+	}
+
+	client, err := NewClient()
+	assert.Check(t, is.Equal(err, nil))
+	for _, tc := range testCases {
+		_, err := client.Convert(tc.options)
+
+		assert.Check(t, is.Equal(err.Error(), tc.errorMessage))
+	}
+}
+
+func TestConvertWithDefaultOptions(t *testing.T) {
+	client, err := NewClient(WithErrorOnWarning())
+	assert.Check(t, is.Equal(err, nil))
+	objects, err := client.Convert(ConvertOptions{
+		ToStdout: true,
+		InputFiles: []string{
+			"./testdata/docker-compose.yaml",
+		},
+	})
+	assert.Check(t, is.Equal(err, nil))
+	for _, object := range objects {
+		if deployment, ok := object.(*appsv1.Deployment); ok {
+			assert.Check(t, is.Equal(int(*deployment.Spec.Replicas), 1))
+		}
+	}
+}
+
+func TestConvertWithProfiles(t *testing.T) {
+	client, err := NewClient(WithErrorOnWarning())
+	assert.Check(t, is.Equal(err, nil))
+
+	type Want struct {
+		deploymentsNames []string
+		servicesNames    []string
+	}
+
+	tests := []struct {
+		name    string
+		options ConvertOptions
+		want    Want
+	}{
+		{
+			name: "No profiles provided",
+			options: ConvertOptions{
+				ToStdout: true,
+				InputFiles: []string{
+					"./testdata/docker-compose-profiles.yaml",
+				},
+			},
+			want: Want{
+				deploymentsNames: nil,
+				servicesNames:    nil,
+			},
+		},
+		{
+			name: "All profiles provided",
+			options: ConvertOptions{
+				ToStdout: true,
+				InputFiles: []string{
+					"./testdata/docker-compose-profiles.yaml",
+				},
+				Profiles: []string{"hello", "world"},
+			},
+			want: Want{
+				deploymentsNames: []string{"backend", "frontend", "database"},
+				servicesNames:    []string{"backend", "frontend", "database"},
+			},
+		},
+		{
+			name: "One profile only",
+			options: ConvertOptions{
+				ToStdout: true,
+				InputFiles: []string{
+					"./testdata/docker-compose-profiles.yaml",
+				},
+				Profiles: []string{"hello"},
+			},
+			want: Want{
+				deploymentsNames: []string{"backend", "frontend"},
+				servicesNames:    []string{"backend", "frontend"},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			objects, err := client.Convert(tt.options)
+			assert.Check(t, is.Equal(err, nil))
+
+			sort.Strings(tt.want.deploymentsNames)
+			sort.Strings(tt.want.servicesNames)
+
+			var deploymentsNames []string
+			var servicesNames []string
+
+			for _, object := range objects {
+				if deployment, ok := object.(*appsv1.Deployment); ok {
+					deploymentsNames = append(deploymentsNames, deployment.Name)
+				}
+
+				if service, ok := object.(*v1.Service); ok {
+					servicesNames = append(servicesNames, service.Name)
+				}
+			}
+
+			sort.Strings(deploymentsNames)
+			sort.Strings(servicesNames)
+
+			assert.Check(t, is.DeepEqual(deploymentsNames, tt.want.deploymentsNames))
+			assert.Check(t, is.DeepEqual(servicesNames, tt.want.servicesNames))
+		})
+	}
+}

client/options.go

@@ -0,0 +1,25 @@
+package client
+
+// Opt is a configuration option to initialize a client
+type Opt func(*Kompose) error
+
+func WithSuppressWarnings() Opt {
+	return func(k *Kompose) error {
+		k.suppressWarnings = true
+		return nil
+	}
+}
+
+func WithVerboseOutput() Opt {
+	return func(k *Kompose) error {
+		k.verbose = true
+		return nil
+	}
+}
+
+func WithErrorOnWarning() Opt {
+	return func(k *Kompose) error {
+		k.errorOnWarning = true
+		return nil
+	}
+}

client/options_test.go

@@ -0,0 +1,61 @@
+package client
+
+import (
+	"testing"
+
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
+)
+
+func TestNewClientWithOpts(t *testing.T) {
+	testCases := []struct {
+		expectedError            error
+		expectedSuppressWarnings bool
+		expectedVerbose          bool
+		expectedErrorOnWarnings  bool
+		opts                     []Opt
+	}{
+		{
+			expectedError:            nil,
+			expectedSuppressWarnings: false,
+			expectedVerbose:          false,
+			expectedErrorOnWarnings:  false,
+			opts:                     []Opt{},
+		},
+		{
+			expectedError:            nil,
+			expectedSuppressWarnings: true,
+			expectedVerbose:          false,
+			expectedErrorOnWarnings:  false,
+			opts:                     []Opt{WithSuppressWarnings()},
+		},
+		{
+			expectedError:            nil,
+			expectedSuppressWarnings: false,
+			expectedVerbose:          true,
+			expectedErrorOnWarnings:  false,
+			opts:                     []Opt{WithVerboseOutput()},
+		},
+		{
+			expectedError:            nil,
+			expectedSuppressWarnings: false,
+			expectedVerbose:          false,
+			expectedErrorOnWarnings:  true,
+			opts:                     []Opt{WithErrorOnWarning()},
+		},
+		{
+			expectedError:            nil,
+			expectedSuppressWarnings: true,
+			expectedVerbose:          false,
+			expectedErrorOnWarnings:  true,
+			opts:                     []Opt{WithErrorOnWarning(), WithSuppressWarnings()},
+		},
+	}
+	for _, tc := range testCases {
+		client, err := NewClient(tc.opts...)
+		assert.Check(t, is.Equal(err, tc.expectedError))
+		assert.Check(t, is.Equal(client.errorOnWarning, tc.expectedErrorOnWarnings))
+		assert.Check(t, is.Equal(client.verbose, tc.expectedVerbose))
+		assert.Check(t, is.Equal(client.suppressWarnings, tc.expectedSuppressWarnings))
+	}
+}

client/testdata/docker-compose-profiles.yaml

@@ -0,0 +1,17 @@
+version: '3'
+services:
+  backend:
+    image: dummy:tag
+    profiles: ['hello', 'world']
+    ports:
+      - "80:80"
+  frontend:
+    image: dummy:tag
+    profiles: [ 'hello' ]
+    ports:
+      - "80:80"
+  database:
+    image: dummy:tag
+    profiles: [ 'world' ]
+    ports:
+      - "80:80"

client/testdata/docker-compose.yaml

@@ -0,0 +1,7 @@
+version: '3'
+services:
+  web:
+    image: nginx:latest
+    ports:
+    - "80:80"
+

client/types.go

@@ -0,0 +1,70 @@
+package client
+
+type ConvertBuild string
+
+const (
+	LOCAL        ConvertBuild = "local"
+	BUILD_CONFIG ConvertBuild = "build-config"
+	NONE         ConvertBuild = "none"
+)
+
+type KubernetesController string
+
+const (
+	DEPLOYMENT             KubernetesController = "deployment"
+	DAEMONSET              KubernetesController = "daemonSet"
+	REPLICATION_CONTROLLER KubernetesController = "replicationController"
+)
+
+type ServiceGroupMode string
+
+const (
+	LABEL  ServiceGroupMode = "label"
+	VOLUME ServiceGroupMode = "volume"
+)
+
+type VolumeType string
+
+const (
+	PVC       = "persistentVolumeClaim"
+	EMPTYDIR  = "emptyDir"
+	HOSTPATH  = "hostPath"
+	CONFIGMAP = "configMap"
+)
+
+type ConvertOptions struct {
+	Build                  *string
+	PushImage              bool
+	PushImageRegistry      string
+	GenerateJson           bool
+	ToStdout               bool
+	OutFile                string
+	Replicas               *int
+	VolumeType             *string
+	PvcRequestSize         string
+	WithKomposeAnnotations *bool
+	InputFiles             []string
+	Profiles               []string
+	Provider
+	GenerateNetworkPolicies bool
+}
+
+type Provider interface{}
+
+type Kubernetes struct {
+	Provider
+	Chart              bool
+	Controller         *string
+	MultiContainerMode bool
+	ServiceGroupMode   *string
+	ServiceGroupName   string
+	SecretsAsFiles     bool
+}
+
+type Openshift struct {
+	Provider
+	DeploymentConfig   bool
+	InsecureRepository bool
+	BuildRepo          string
+	BuildBranch        string
+}

cmd/completion.go

@@ -63,7 +63,7 @@ func init() {
 }
 
 /*
-	Fish shell auto-completion support
+Fish shell auto-completion support
 */
 func runCompletionFish(out io.Writer, kompose *cobra.Command) error {
 	kompose.GenFishCompletion(out, true)
@@ -79,12 +79,14 @@ complete -c kompose -n "__fish_seen_subcommand_from completion" -a "bash zsh fis
 }
 
 /*
-	This is copied from
-	https://github.com/kubernetes/kubernetes/blob/ea18d5c32ee7c320fe96dda6b0c757476908e696/pkg/kubectl/cmd/completion.go
-	in order to generate ZSH completion support.
+This is copied from
+https://github.com/kubernetes/kubernetes/blob/ea18d5c32ee7c320fe96dda6b0c757476908e696/pkg/kubectl/cmd/completion.go
+in order to generate ZSH completion support.
 */
 func runCompletionZsh(out io.Writer, kompose *cobra.Command) error {
 	zshInitialization := `
+#compdef kompose
+
 __kompose_bash_source() {
 	alias shopt=':'
 	alias _expand=_bash_expand

cmd/convert.go

@@ -46,25 +46,45 @@ var (
 	ConvertDeploymentConfig      bool
 	ConvertReplicas              int
 	ConvertController            string
+	ConvertProfiles              []string
 	ConvertPushImage             bool
+	ConvertNamespace             string
 	ConvertPushImageRegistry     string
 	ConvertOpt                   kobject.ConvertOptions
 	ConvertYAMLIndent            int
+	GenerateNetworkPolicies      bool
 
 	UpBuild string
 
+	BuildCommand string
+	PushCommand  string
 	// WithKomposeAnnotation decides if we will add metadata about this convert to resource's annotation.
 	// default is true.
 	WithKomposeAnnotation bool
 
-	// MultipleContainerMode which enables creating multi containers in a single pod is a developping function.
+	// NoInterpolation decides if we will interpolate environment variables in the compose file.
+	NoInterpolate bool
+
+	// MultipleContainerMode which enables creating multi containers in a single pod is a developing function.
 	// default is false
 	MultipleContainerMode bool
+
+	ServiceGroupMode string
+	ServiceGroupName string
+
+	// SecretsAsFiles forces secrets to result in files inside a container instead of symlinked directories containing
+	// files of the same name. This reproduces the behavior of file-based secrets in docker-compose and should probably
+	// be the default for kompose, but we must keep compatibility with the previous behavior.
+	// See https://github.com/kubernetes/kompose/issues/1280 for more details.
+	SecretsAsFiles bool
 )
 
 var convertCmd = &cobra.Command{
-	Use:   "convert [file]",
-	Short: "Convert a Docker Compose file",
+	Use:   "convert",
+	Short: "Convert a Compose file",
+	Example: `  kompose --file compose.yaml convert
+  kompose -f first.yaml -f second.yaml convert
+  kompose --provider openshift --file compose.yaml convert`,
 	PreRun: func(cmd *cobra.Command, args []string) {
 
 		// Check that build-config wasn't passed in with --provider=kubernetes
@@ -102,13 +122,30 @@ var convertCmd = &cobra.Command{
 			IsReplicaSetFlag:            cmd.Flags().Lookup("replicas").Changed,
 			IsDeploymentConfigFlag:      cmd.Flags().Lookup("deployment-config").Changed,
 			YAMLIndent:                  ConvertYAMLIndent,
+			Profiles:                    ConvertProfiles,
 			WithKomposeAnnotation:       WithKomposeAnnotation,
+			NoInterpolate:               NoInterpolate,
 			MultipleContainerMode:       MultipleContainerMode,
+			ServiceGroupMode:            ServiceGroupMode,
+			ServiceGroupName:            ServiceGroupName,
+			SecretsAsFiles:              SecretsAsFiles,
+			GenerateNetworkPolicies:     GenerateNetworkPolicies,
+			BuildCommand:                BuildCommand,
+			PushCommand:                 PushCommand,
+			Namespace:                   ConvertNamespace,
 		}
 
-		// Validate before doing anything else. Use "bundle" if passed in.
-		app.ValidateFlags(GlobalBundle, args, cmd, &ConvertOpt)
-		app.ValidateComposeFile(&ConvertOpt)
+		if ServiceGroupMode == "" && MultipleContainerMode {
+			ConvertOpt.ServiceGroupMode = "label"
+		}
+
+		app.ValidateFlags(args, cmd, &ConvertOpt)
+
+		// Since ValidateComposeFiles returns an error, let's validate it and output the error appropriately if the validation fails
+		err := app.ValidateComposeFile(&ConvertOpt)
+		if err != nil {
+			log.Fatalf("Error validating compose file: %v", err)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 
@@ -134,6 +171,10 @@ func init() {
 	convertCmd.Flags().MarkHidden("replication-controller")
 	convertCmd.Flags().MarkHidden("deployment")
 	convertCmd.Flags().BoolVar(&MultipleContainerMode, "multiple-container-mode", false, "Create multiple containers grouped by 'kompose.service.group' label")
+	convertCmd.Flags().StringVar(&ServiceGroupMode, "service-group-mode", "", "Group multiple service to create single workload by `label`(`kompose.service.group`) or `volume`(shared volumes)")
+	convertCmd.Flags().StringVar(&ServiceGroupName, "service-group-name", "", "Using with --service-group-mode=volume to specific a final service name for the group")
+	convertCmd.Flags().MarkDeprecated("multiple-container-mode", "use --service-group-mode=label")
+	convertCmd.Flags().BoolVar(&SecretsAsFiles, "secrets-as-files", false, "Always convert docker-compose secrets into files instead of symlinked directories")
 
 	// OpenShift only
 	convertCmd.Flags().BoolVar(&ConvertDeploymentConfig, "deployment-config", true, "Generate an OpenShift deploymentconfig object")
@@ -149,25 +190,32 @@ func init() {
 	// Standard between the two
 	convertCmd.Flags().StringVar(&ConvertBuild, "build", "none", `Set the type of build ("local"|"build-config"(OpenShift only)|"none")`)
 	convertCmd.Flags().BoolVar(&ConvertPushImage, "push-image", false, "If we should push the docker image we built")
-	convertCmd.Flags().StringVar(&ConvertPushImageRegistry, "push-image-registry", "", "Specify registry for pushing image, which will override registry from image name.")
+	convertCmd.Flags().StringVar(&BuildCommand, "build-command", "", `Set the command used to build the container image, which will override the docker build command. Should be used in conjuction with --push-command flag.`)
+	convertCmd.Flags().StringVar(&PushCommand, "push-command", "", `Set the command used to push the container image. override the docker push command. Should be used in conjuction with --build-command flag.`)
+	convertCmd.Flags().StringVar(&ConvertPushImageRegistry, "push-image-registry", "", "Specify registry for pushing image, which will override registry from image name")
 	convertCmd.Flags().BoolVarP(&ConvertYaml, "yaml", "y", false, "Generate resource files into YAML format")
-	convertCmd.Flags().MarkDeprecated("yaml", "YAML is the default format now.")
-	convertCmd.Flags().MarkShorthandDeprecated("y", "YAML is the default format now.")
+	convertCmd.Flags().MarkDeprecated("yaml", "YAML is the default format now")
+	convertCmd.Flags().MarkShorthandDeprecated("y", "YAML is the default format now")
 	convertCmd.Flags().BoolVarP(&ConvertJSON, "json", "j", false, "Generate resource files into JSON format")
 	convertCmd.Flags().BoolVar(&ConvertStdout, "stdout", false, "Print converted objects to stdout")
 	convertCmd.Flags().StringVarP(&ConvertOut, "out", "o", "", "Specify a file name or directory to save objects to (if path does not exist, a file will be created)")
 	convertCmd.Flags().IntVar(&ConvertReplicas, "replicas", 1, "Specify the number of replicas in the generated resource spec")
 	convertCmd.Flags().StringVar(&ConvertVolumes, "volumes", "persistentVolumeClaim", `Volumes to be generated ("persistentVolumeClaim"|"emptyDir"|"hostPath" | "configMap")`)
 	convertCmd.Flags().StringVar(&ConvertPVCRequestSize, "pvc-request-size", "", `Specify the size of pvc storage requests in the generated resource spec`)
+	convertCmd.Flags().StringVarP(&ConvertNamespace, "namespace", "n", "", `Specify the namespace of the generated resources`)
+	convertCmd.Flags().BoolVar(&GenerateNetworkPolicies, "generate-network-policies", false, "Specify whether to generate network policies or not")
 
 	convertCmd.Flags().BoolVar(&WithKomposeAnnotation, "with-kompose-annotation", true, "Add kompose annotations to generated resource")
+	convertCmd.Flags().BoolVar(&NoInterpolate, "no-interpolate", false, "Keep environment variable names in the Compose file")
 
 	// Deprecated commands
 	convertCmd.Flags().BoolVar(&ConvertEmptyVols, "emptyvols", false, "Use Empty Volumes. Do not generate PVCs")
-	convertCmd.Flags().MarkDeprecated("emptyvols", "emptyvols has been marked as deprecated. Use --volumes empty")
+	convertCmd.Flags().MarkDeprecated("emptyvols", "emptyvols has been marked as deprecated. Use --volumes emptyDir")
 
 	convertCmd.Flags().IntVar(&ConvertYAMLIndent, "indent", 2, "Spaces length to indent generated yaml files")
 
+	convertCmd.Flags().StringArrayVar(&ConvertProfiles, "profile", []string{}, `Specify the profile to use, can use multiple profiles`)
+
 	// In order to 'separate' both OpenShift and Kubernetes only flags. A custom help page is created
 	customHelp := `Usage:{{if .Runnable}}
   {{if .HasAvailableFlags}}{{appendIfNotPresent .UseLine "[flags]"}}{{else}}{{.UseLine}}{{end}}{{end}}{{if .HasAvailableSubCommands}}
@@ -183,15 +231,14 @@ Available Commands:{{range .Commands}}{{if .IsAvailableCommand}}
   {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{ if .HasAvailableLocalFlags}}
 
 Kubernetes Flags:
-      --daemon-set               Generate a Kubernetes daemonset object (deprecated, use --controller instead)
-  -d, --deployment               Generate a Kubernetes deployment object (deprecated, use --controller instead)
   -c, --chart                    Create a Helm chart for converted objects
-      --replication-controller   Generate a Kubernetes replication controller object (deprecated, use --controller instead)
+      --controller               Set the output controller ("deployment"|"daemonSet"|"replicationController")
+      --service-group-mode       Group multiple service to create single workload by "label"("kompose.service.group") or "volume"(shared volumes)
+      --service-group-name       Using with --service-group-mode=volume to specific a final service name for the group
 
 OpenShift Flags:
       --build-branch             Specify repository branch to use for buildconfig (default is current branch name)
       --build-repo               Specify source repository for buildconfig (default is current branch's remote url)
-      --deployment-config        Generate an OpenShift deployment config object
       --insecure-repository      Specify to use insecure docker repository while generating Openshift image stream object
 
 Flags:

cmd/root.go

@@ -21,6 +21,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
 )
 
 // Logrus hooks
@@ -39,7 +41,6 @@ func (errorOnWarningHook) Fire(entry *log.Entry) error {
 
 // TODO: comment
 var (
-	GlobalBundle           string
 	GlobalProvider         string
 	GlobalVerbose          bool
 	GlobalSuppressWarnings bool
@@ -49,9 +50,13 @@ var (
 
 // RootCmd root level flags and commands
 var RootCmd = &cobra.Command{
-	Use:           "kompose",
-	Short:         "A tool helping Docker Compose users move to Kubernetes",
-	Long:          `Kompose is a tool to help users who are familiar with docker-compose move to Kubernetes.`,
+	Use:   "kompose",
+	Short: "A tool helping Compose users move to Kubernetes",
+	Long:  `Kompose is a tool to help users who are familiar with docker-compose move to Kubernetes.`,
+	Example: `  kompose --file compose.yaml convert
+  kompose -f first.yaml -f second.yaml convert
+  kompose --provider openshift --file compose.yaml convert
+  kompose completion bash`,
 	SilenceErrors: true,
 	// PersistentPreRun will be "inherited" by all children and ran before *every* command unless
 	// the child has overridden the functionality. This functionality was implemented to check / modify
@@ -81,11 +86,21 @@ var RootCmd = &cobra.Command{
 		if provider != "kubernetes" && provider != "openshift" {
 			log.Fatalf("%s is an unsupported provider. Supported providers are: 'kubernetes', 'openshift'.", GlobalProvider)
 		}
+
+		v := viper.New()
+		v.BindEnv("file", "COMPOSE_FILE")
+
+		cmd.Flags().VisitAll(func(f *pflag.Flag) {
+			configName := f.Name
+			if configName == "file" && !f.Changed && v.IsSet(configName) {
+				GlobalFiles = v.GetStringSlice(configName)
+			}
+		})
 	},
 }
 
 // Execute executes the root level command.
-// It returns an erorr if any.
+// It returns an error if any.
 func Execute() error {
 	return RootCmd.Execute()
 }
@@ -94,11 +109,6 @@ func init() {
 	RootCmd.PersistentFlags().BoolVarP(&GlobalVerbose, "verbose", "v", false, "verbose output")
 	RootCmd.PersistentFlags().BoolVar(&GlobalSuppressWarnings, "suppress-warnings", false, "Suppress all warnings")
 	RootCmd.PersistentFlags().BoolVar(&GlobalErrorOnWarning, "error-on-warning", false, "Treat any warning as an error")
-	RootCmd.PersistentFlags().StringArrayVarP(&GlobalFiles, "file", "f", []string{}, "Specify an alternative compose file")
-	RootCmd.PersistentFlags().StringVarP(&GlobalBundle, "bundle", "b", "", "Specify a Distributed Application Bundle (DAB) file")
+	RootCmd.PersistentFlags().StringSliceVarP(&GlobalFiles, "file", "f", []string{}, "Specify an alternative compose file")
 	RootCmd.PersistentFlags().StringVar(&GlobalProvider, "provider", "kubernetes", "Specify a provider. Kubernetes or OpenShift.")
-
-	// Mark DAB / bundle as deprecated, see issue: https://github.com/kubernetes/kompose/issues/390
-	// As DAB is still EXPERIMENTAL
-	RootCmd.PersistentFlags().MarkDeprecated("bundle", "DAB / Bundle is deprecated, see: https://github.com/kubernetes/kompose/issues/390")
 }

docs/404.html

@@ -0,0 +1,25 @@
+---
+permalink: /404.html
+layout: default
+---
+
+<style type="text/css" media="screen">
+  .container {
+    margin: 10px auto;
+    max-width: 600px;
+    text-align: center;
+  }
+  h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container">
+  <h1>404</h1>
+
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+</div>

docs/CNAME

@@ -0,0 +1 @@
+kompose.io

docs/Gemfile

@@ -0,0 +1,32 @@
+source "https://rubygems.org"
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "~> 4.0.0"
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "minima", "~> 2.5"
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.12"
+end
+
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
+# and associated library.
+install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+  gem "tzinfo", "~> 1.2"
+  gem "tzinfo-data"
+end
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
+
+gem "jekyll-redirect-from"
+

docs/Gemfile.lock

@@ -0,0 +1,89 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.10)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    eventmachine (1.2.7)
+    ffi (1.15.5)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.8.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.0.1)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (>= 0.9.5, < 2)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
+      safe_yaml (~> 1.0)
+      terminal-table (~> 1.8)
+    jekyll-feed (0.17.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (2.2.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.8.0)
+      jekyll (>= 3.8, < 5.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.4)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.3.6)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (5.0.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.3.9)
+    rouge (3.30.0)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.10)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2022.7)
+      tzinfo (>= 1.0.0)
+    unicode-display_width (1.8.0)
+    wdm (0.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll (~> 4.0.0)
+  jekyll-feed (~> 0.12)
+  jekyll-redirect-from
+  minima (~> 2.5)
+  tzinfo (~> 1.2)
+  tzinfo-data
+  wdm (~> 0.1.1)
+
+BUNDLED WITH
+   2.4.4

docs/LICENSE

@@ -0,0 +1,25 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2016 GochoMugo <mugo@forfuture.co.ke>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to
+whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall
+be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

docs/README.md

@@ -1 +1,7 @@
-Note: These /docs files are best viewed at [kompose.io](http://kompose.io)
+View the site via:
+
+```sh
+bundle exec jekyll serve .
+```
+
+And visiting `localhost:4000` on your browser.

docs/_config.yml

@@ -0,0 +1,21 @@
+title: Kompose
+name: Kompose
+email: foo@gmail.com
+github_page: https://github.com/kubernetes/kompose
+slack_page: https://slack.k8s.io
+description: >- # this means to ignore newlines until "baseurl:"
+  Convert your Docker Compose file to Kubernetes or OpenShift
+baseurl: "" # the subpath of your site, e.g. /blog
+url: "" # the base hostname & protocol for your site, e.g. http://example.com
+year: 2024
+
+# Google Analytics number (starts with UA?)
+analytics: 12345
+
+instagram: https://www.instagram.com
+facebook: https://www.facebook.com
+
+# Build settings
+theme: minima
+plugins:
+  - jekyll-feed

docs/_data/dates.yml

@@ -0,0 +1,72 @@
+- date: "Saturday May 8"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday May 17"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday May 31"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday June 7"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday June 14"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday June 21"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday July 5"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday July 19"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday July 26"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday August 9"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday August 16"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday August 23"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday August 30"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday September 13"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Friday September 24"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday September 27"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Monday October 4"
+  green: 20
+  yellow: 20
+  red: 20
+- date: "Sunday October 10"
+  green: 20
+  yellow: 20
+  red: 20

docs/_data/menu.yml

@@ -0,0 +1,6 @@
+other_links:
+  "Installation": "/installation/"
+  "Getting Started": "/getting-started/"
+  "User Guide": "/user-guide/"
+  "Conversion Matrix": "/conversion/"
+  "Architecture": "/architecture/"

docs/_foobar.yml

@@ -0,0 +1,2 @@
+dates:
+  "May 8th 2021"

docs/_includes/footer.html

@@ -0,0 +1,50 @@
+<!-- Footer -->
+<div class="footer">
+  <div class="container text-center">
+    <span class="copyright">
+      We are a Kubernetes incubator graduated project and officially part of the Kubernetes group
+      <br>
+      Apache License 2.0 licensed project
+      <br>
+      © {{ site.year }} Kompose Authors -- All Rights Reserved
+      <br />
+      <a
+        class="trademarks"
+        href="https://www.linuxfoundation.org/legal/trademark-usage"
+        target="_blank"
+        ref="noopener"
+        >Trademarks</a
+      >
+    </span>
+  </div>
+  <div class="container">
+    <div class="row text-center">
+      <div class="col-lg-2 col-md-3 col-sm-12">
+        <div class="footer-logo">
+          <h2>{{ site.name }}</h2>
+        </div>
+      </div>
+      <div class="col-lg-6 col-md-6 col-sm-12">
+        <ul class="footer-menu">
+          <!--
+            {% for item in site.data.menu.footer %}
+            <li><a href="{{ item[1] }}">{{ item[0] }}</a></li>
+            {% endfor %}
+          -->
+
+        </ul>
+      </div>
+      <div class="col-lg-4 col-md-3 col-sm-12">
+        <div class="footer-links">
+          <ul>
+            <li><a href="{{ site.slack_page }}" target="_blank"><img class="img-fluid" src="/assets/icons/slack.png" alt="Slack">Slack</a> </li>
+            <li><a href="{{ site.github_page }}" target="_blank"><img class="img-fluid" src="/assets/icons/github.png" alt="GitHub">GitHub</a> </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <!-- Scroll To Top -->
+    <!--<a id="back-top" class="back-to-top js-scroll-trigger" href="#main"></a>-->
+    <!-- Scroll To Top Ends-->
+  </div>
+</div>

docs/_includes/meta.html

@@ -0,0 +1,46 @@
+<!-- Meta -->
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="description" content="{{site.description}}">
+
+<!-- Cross-site Meta -->
+<meta name="robots" content="index, follow">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="language" content="English">
+
+<!-- Metadata loading stuff-->
+<link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="all" />
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+<link href="https://fonts.googleapis.com/css?family=Open+Sans:200,300,400,400i,500,600,700%7CMontserrat:300,400,500%7CRoboto" rel="stylesheet">
+<link rel="stylesheet" href="/assets/css/animate.css"> <!-- Resource style -->
+<link rel="stylesheet" href="/assets/css/owl.carousel.css">
+<link rel="stylesheet" href="/assets/css/owl.theme.css">
+<link rel="stylesheet" href="/assets/css/magnific-popup.css">
+<link rel="stylesheet" href="/assets/css/ionicons.min.css"> <!-- Resource style -->
+<link rel="stylesheet" href="/assets/css/style.css">
+<link rel="stylesheet" href="/assets/css/github-markdown.css">
+
+
+<!-- Favicons -->
+<!-- Generate using: https://realfavicongenerator.net/ and put information in /assets/favicons/ folder -->
+<link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/assets/favicons/favicon-16x16.png">
+<link rel="manifest" href="/assets/favicons/site.webmanifest">
+<link rel="mask-icon" href="/assets/favicons/safari-pinned-tab.svg" color="#5bbad5">
+<link rel="shortcut icon" href="/assets/favicons/favicon.ico">
+<meta name="msapplication-TileColor" content="#da532c">
+<meta name="msapplication-config" content="/assets/favicons/browserconfig.xml">
+<meta name="theme-color" content="#ffffff">
+
+<!-- ANALYTICS -->
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.analytics }}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+function gtag(){dataLayer.push(arguments);}
+gtag('js', new Date());
+
+gtag('config', '{{ site.analytics }}');
+</script>
+

docs/_includes/navbar.html

@@ -0,0 +1,18 @@
+      <!-- Navbar Section -->
+      <nav class="navbar navbar-expand-md navbar-light bg-light fixed-top">
+        <div class="container">
+          <a class="navbar-brand" href="/">
+            <img class="navbar-logo" src="/assets/images/logo.png" alt="logo"/>
+          </a>
+          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+          </button>
+          <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            <ul class="navbar-nav ml-auto navbar-right">
+              {% for item in site.data.menu.other_links %}
+                <li class="nav-item"><a class="nav-link" href="{{ item[1] }}">{{ item[0] }}</a></li>
+              {% endfor %}
+            </ul>
+          </div>
+        </div>
+      </nav><!-- Navbar End -->

docs/_layouts/default.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<whtml lang="en">
+  <head>
+
+    <!-- Metadata -->
+    <meta charset="utf-8">
+    <title>{{ site.title }} - {{ page.title }}</title>
+    <meta name="title" content="{{ site.title }} - {{ page.title }}">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {% include meta.html %}
+
+  </head>
+  <body>
+    <div class="wrapper">
+
+      {% include navbar.html %}
+
+      <div id="main" class="main">
+        <div class="first"><!-- Hero Section-->
+          <div class="container">
+            <div class="row">
+                  <div class="markdown-body">
+                    {{ content }}
+                  </div>
+            </div>
+
+            <div class="questions flex-out align-center wow fadeIn">
+              <p>
+              </p>
+            </div>
+          </div>
+
+        </div><!-- Hero End -->
+      </div>
+
+
+      {% include footer.html %}
+
+    </div> <!-- Main -->
+
+
+    <!-- Jquery and Js Plugins -->
+    <script src="/assets/js/jquery-2.1.1.js"></script>
+    <script src="/assets/js/popper.min.js"></script>
+    <script src="/assets/js/jquery.validate.min.js"></script>
+    <script src="/assets/js/bootstrap.min.js"></script>
+    <script src="/assets/js/plugins.js"></script>
+    <script src="/assets/js/menu.js"></script>
+    <script src="/assets/js/custom.js"></script>
+    <script>
+      $('.navbar-nav>li>a').on('click', function(){
+
+        $('.navbar-collapse').collapse('hide');
+
+      });
+    </script>
+  </body>
+</html>

docs/_layouts/index.html

@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+
+    <!-- Metadata -->
+    <meta charset="utf-8">
+    <title>{{ site.title }} - {{ site.description }}</title>
+    <meta name="title" content="{{ site.title }} - {{ site.description }}">
+
+    {% include meta.html %}
+
+  </head>
+  <body>
+    <div class="wrapper">
+
+      {% include navbar.html %}
+
+      <div id="main" class="main">
+        <div class="first home-3"><!-- Hero Section-->
+            <div class="questions flex-out align-center wow fadeIn">
+              <p>
+              An official Kubernetes project, located at <a href="https://github.com/kubernetes/kompose" target="_blank">github.com/kubernetes/kompose</a>
+              </p>
+            </div>
+          <div class="container">
+            <div class="row">
+              <div class="col-md-5">
+                <div class="hero-content wow fadeIn">
+                  <div class="hero-content-inner">
+                    <h4>Go from Docker Compose to Kubernetes</h4>
+                    <h1>Kompose</h1>
+                    <p>
+                    Kompose is a conversion tool for Docker Compose to container orchestrators such as Kubernetes (or OpenShift).
+
+                    </p>
+                    <a class="btn-action" href="/installation">Installation</a>
+                  </div>
+                </div>
+              </div>
+              <div class="col-md-7 markdown-body code-example">
+                  {{ content }}
+              </div>
+            </div>
+
+          </div>
+
+        </div><!-- Hero End -->
+
+        <div id="what" class="what home-3"><!-- Hero Section-->
+          <div class="container">
+            <div class="flex-intro align-center wow fadeIn">
+              <h2>Get started on Kubernetes immediately</h2>
+              <p>
+              So easy your human companion could do it too!
+              </p>
+            </div>
+            <div class="row">
+
+              <div class="col-md-7">
+                <div class="hero-img loop-video">
+                  <video class="embed-responsive drone-video" autoplay loop muted>
+                    <source src="assets/video/cat.webm" type="video/webm" />
+                  </video>
+                </div>
+              </div>
+
+              <div class="col-md-5">
+                <div class="hero-content wow fadeIn">
+                  <div class="hero-content-inner">
+                    <p>
+                    Why do cats (and developers) like Kompose?
+                    <br>
+                    <br>
+                    Developers love to simplify their development environment with Docker Compose.
+                    <br>
+                    <br>
+                    With Kompose, you can now push the same file to a production container orchestrator!
+                    </p>
+                    <a class="btn-action" href="/getting-started">Getting Started</a>
+                  </div>
+                </div>
+              </div>
+
+
+            </div>
+
+          </div>
+        </div><!-- Hero End -->
+
+        <div id="date" class="home home-3"><!-- Hero Section-->
+          <div class="container">
+            <div class="flex-intro align-center wow fadeIn">
+              <h2>Built for container engineers</h2>
+              <p>
+              Our conversions are not always 1-1 from Docker Compose to Kubernetes, but we will help get you 99% of the way there!
+              </p>
+            </div>
+            <div class="row">
+
+              <div class="col-md-5">
+                <div class="hero-content wow fadeIn">
+                  <div class="hero-content-inner">
+                    <h4>The awesome features</h4>
+                    <p>
+                    • Compatibility with multiple versions of Docker Compose
+                    <br>
+                    • A <a href="/conversion">conversion matrix</a> that outlines all compatible values and versions
+                    <br>
+                    • An in-depth <a href="/user-guide">user guide</a> to use advanced features such as LoadBalancer, Service and TLS
+                    <br>
+                    • <a href="/user-guide#labels">Labels</a> that provide the extra 1% needed to get to 1-1 conversion
+                    </p>
+                    <a class="btn-action" href="/user-guide">User Guide</a>
+                  </div>
+                </div>
+              </div>
+
+              <div class="col-md-7">
+                <div class="hero-img loop-video">
+                  <video class="embed-responsive drone-video" autoplay loop muted>
+                    <source src="assets/video/coding.webm" type="video/webm" />
+                  </video>
+                </div>
+              </div>
+
+            </div>
+
+          </div>
+        </div><!-- Hero End -->
+
+      </div>
+
+
+      {% include footer.html %}
+
+    </div> <!-- Main -->
+
+
+    <!-- Jquery and Js Plugins -->
+    <script src="assets/js/jquery-2.1.1.js"></script>
+    <script src="assets/js/popper.min.js"></script>
+    <script src="assets/js/jquery.validate.min.js"></script>
+    <script src="assets/js/bootstrap.min.js"></script>
+    <script src="assets/js/plugins.js"></script>
+    <script src="assets/js/menu.js"></script>
+    <script src="assets/js/custom.js"></script>
+    <script>
+      $('.navbar-nav>li>a').on('click', function(){
+
+        $('.navbar-collapse').collapse('hide');
+
+      });
+    </script>
+  </body>
+</html>

docs/architecture.md

@@ -1,29 +1,37 @@
+---
+layout: default
+permalink: /architecture/
+title: Architecture
+redirect_from:
+  - /docs/architecture.md/
+  - /docs/architecture/
+---
+
 # Architecture and Internal Design
 
 * TOC
 {:toc}
 
-`kompose` has 3 stages: Loader, Transformer and Outputter. Each Stage should have well defined interface so it is easy to write new Loader, Transformer or Outputters and plug it in. Currently only Loader and Transformer interfaces are defined.
+`kompose` has 3 stages: _Loader_, _Transformer_ and _Outputter_. Each stage should have a well-defined interface, so it is easy to write a new Loader, Transformer, or Outputters and plug it in. Currently, only Loader and Transformer interfaces are defined.
 
-![Design Diagram](/docs/images/design_diagram.png)
+![Design Diagram](https://raw.githubusercontent.com/kubernetes/kompose/main/docs/images/design_diagram.png)
 
 ## Loader
 
-Loader reads input file (now `kompose` supports [Docker Compose](https://docs.docker.com/compose) v1, v2 and [Docker Distributed Application Bundle](https://blog.docker.com/2016/06/docker-app-bundle/) file) and converts it to KomposeObject.
+The Loader reads the input file now `kompose` supports [Compose](https://docs.docker.com/compose) v1, v2 and converts it to KomposeObject.
 
 Loader is represented by a Loader interface:
- 
+
 ```go
 type Loader interface {
       LoadFile(file string) kobject.KomposeObject
 }
 ```
 
-Every loader “implementation” should be placed into `kompose/pkg/loader` (like compose & bundle). More input formats will be supported in future. You can take a look for more details at:
+Every loader “implementation” should be placed into `kompose/pkg/loader` (like compose). More input formats will be supported in the future. You can take a look for more details at:
 
-* [kompose/pkg/loader](https://github.com/kubernetes/kompose/tree/master/pkg/loader)
-* [kompose/pkg/loader/bundle](https://github.com/kubernetes/kompose/tree/master/pkg/loader/bundle)
-* [kompose/pkg/loader/compose](https://github.com/kubernetes/kompose/tree/master/pkg/loader/compose)
+- [kompose/pkg/loader](https://github.com/kubernetes/kompose/tree/master/pkg/loader)
+- [kompose/pkg/loader/compose](https://github.com/kubernetes/kompose/tree/master/pkg/loader/compose)
 
 ## KomposeObject
 
@@ -32,38 +40,38 @@ Every loader “implementation” should be placed into `kompose/pkg/loader` (li
 ```go
 // KomposeObject holds the generic struct of Kompose transformation
 type KomposeObject struct {
-	ServiceConfigs map[string]ServiceConfig
+    ServiceConfigs map[string]ServiceConfig
 }
 
 // ServiceConfig holds the basic struct of a container
 type ServiceConfig struct {
-	ContainerName string
-	Image         string
-	Environment   []EnvVar
-	Port          []Ports
-	Command       []string
-	WorkingDir    string
-	Args          []string
-	Volumes       []string
-	Network       []string
-	Labels        map[string]string
-	Annotations   map[string]string
-	CPUSet        string
-	CPUShares     int64
-	CPUQuota      int64
-	CapAdd        []string
-	CapDrop       []string
-	Entrypoint    []string
-	Expose        []string
-	Privileged    bool
-	Restart       string
-	User          string
+    ContainerName string
+    Image         string
+    Environment   []EnvVar
+    Port          []Ports
+    Command       []string
+    WorkingDir    string
+    Args          []string
+    Volumes       []string
+    Network       []string
+    Labels        map[string]string
+    Annotations   map[string]string
+    CPUSet        string
+    CPUShares     int64
+    CPUQuota      int64
+    CapAdd        []string
+    CapDrop       []string
+    Entrypoint    []string
+    Expose        []string
+    Privileged    bool
+    Restart       string
+    User          string
 }
 ```
 
 ## Transformer
 
-Transformer takes KomposeObject and converts it to target/output format (at this moment, there are sets of kubernetes/openshift objects). Similar to `Loader`, Transformer is represented by a Transformer interface:
+The Transformer takes KomposeObject and converts it to target/output format (currently, there are sets of Kubernetes/OpenShift objects). Similar to the `Loader`, Transformer is represented by a Transformer interface:
 
 ```go
 type Transformer interface {
@@ -71,12 +79,12 @@ type Transformer interface {
 }
 ```
 
-If you wish to add more providers which contain different kind of objects, transformer would be the place to look into. At this moment Kompose supports Kubernetes (by default) and Openshift providers. More details at:
+If you wish to add more providers containing different kinds of objects, the Transformer would be the place to look into. Currently, Kompose supports Kubernetes (by default) and OpenShift providers. More details at:
 
-* [kompose/pkg/transformer](https://github.com/kubernetes/kompose/tree/master/pkg/transformer)
-* [kompose/pkg/transformer/kubernetes](https://github.com/kubernetes/kompose/tree/master/pkg/transformer/kubernetes)
-* [kompose/pkg/transformer/openshift](https://github.com/kubernetes/kompose/tree/master/pkg/transformer/openshift)
+- [kompose/pkg/transformer](https://github.com/kubernetes/kompose/tree/master/pkg/transformer)
+- [kompose/pkg/transformer/Kubernetes](https://github.com/kubernetes/kompose/tree/master/pkg/transformer/kubernetes)
+- [kompose/pkg/transformer/openshift](https://github.com/kubernetes/kompose/tree/master/pkg/transformer/openshift)
 
 ## Outputter
 
-Outputter takes Transformer result and executes given action. For example action can be displaying result to stdout or directly deploying artifacts to Kubernetes/OpenShift.
+The Outputter takes the Transformer result and executes the given action. For example, action can display results to stdout or directly deploy artifacts to Kubernetes/OpenShift.

docs/assets/css/jquery.accordion.css

@@ -0,0 +1,63 @@
+/*!
+ * jQuery Accordion 0.0.1
+ * (c) 2014 Victor Fernandez <victor@vctrfrnndz.com>
+ * MIT Licensed.
+ */
+
+/* Requirements */
+
+[data-accordion] [data-content] {
+    overflow: hidden;
+    max-height: 0;
+}
+
+/* Basic Theme */
+
+[data-accordion-group] {
+  padding: 20px;
+  box-shadow: 0 0px 15px rgba(0,0,0,0.06);
+}
+
+[data-control] {
+  cursor: pointer;
+}
+
+[data-accordion] {
+    line-height: 1;
+}
+
+[data-control],
+[data-content] > * {
+    border-bottom: 1px solid #EEE;
+    padding: 10px;
+}
+
+[data-content] [data-accordion] {
+    border: 0;
+    padding: 0;
+}
+
+[data-accordion] [data-control] {
+    position: relative;
+    padding-right: 40px;
+}
+
+[data-accordion] > [data-control]:after {
+    content: "";
+    position: absolute;
+    right: 10px;
+    top: 12px;
+    font-size: 25px;
+    font-weight: 200;
+    color: #444;
+    height: 15px;
+    width: 24px;
+    background: url('../images/down.png') center center no-repeat;
+    background-size: 50%;
+}
+
+[data-accordion].open > [data-control]:after {
+    -webkit-transform: rotate(-180deg);
+    -ms-transform: rotate(-180deg);
+    transform: rotate(-180deg);
+}

docs/assets/css/magnific-popup.css

@@ -0,0 +1,351 @@
+/* Magnific Popup CSS */
+.mfp-bg {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1042;
+  overflow: hidden;
+  position: fixed;
+  background: #0b0b0b;
+  opacity: 0.8; }
+
+.mfp-wrap {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1043;
+  position: fixed;
+  outline: none !important;
+  -webkit-backface-visibility: hidden; }
+
+.mfp-container {
+  text-align: center;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  padding: 0 8px;
+  box-sizing: border-box; }
+
+.mfp-container:before {
+  content: '';
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle; }
+
+.mfp-align-top .mfp-container:before {
+  display: none; }
+
+.mfp-content {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  margin: 0 auto;
+  text-align: left;
+  z-index: 1045; }
+
+.mfp-inline-holder .mfp-content,
+.mfp-ajax-holder .mfp-content {
+  width: 100%;
+  cursor: auto; }
+
+.mfp-ajax-cur {
+  cursor: progress; }
+
+.mfp-zoom-out-cur, .mfp-zoom-out-cur .mfp-image-holder .mfp-close {
+  cursor: -moz-zoom-out;
+  cursor: -webkit-zoom-out;
+  cursor: zoom-out; }
+
+.mfp-zoom {
+  cursor: pointer;
+  cursor: -webkit-zoom-in;
+  cursor: -moz-zoom-in;
+  cursor: zoom-in; }
+
+.mfp-auto-cursor .mfp-content {
+  cursor: auto; }
+
+.mfp-close,
+.mfp-arrow,
+.mfp-preloader,
+.mfp-counter {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none; }
+
+.mfp-loading.mfp-figure {
+  display: none; }
+
+.mfp-hide {
+  display: none !important; }
+
+.mfp-preloader {
+  color: #CCC;
+  position: absolute;
+  top: 50%;
+  width: auto;
+  text-align: center;
+  margin-top: -0.8em;
+  left: 8px;
+  right: 8px;
+  z-index: 1044; }
+  .mfp-preloader a {
+    color: #CCC; }
+    .mfp-preloader a:hover {
+      color: #FFF; }
+
+.mfp-s-ready .mfp-preloader {
+  display: none; }
+
+.mfp-s-error .mfp-content {
+  display: none; }
+
+button.mfp-close,
+button.mfp-arrow {
+  overflow: visible;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+  display: block;
+  outline: none;
+  padding: 0;
+  z-index: 1046;
+  box-shadow: none;
+  touch-action: manipulation; }
+
+button::-moz-focus-inner {
+  padding: 0;
+  border: 0; }
+
+.mfp-close {
+  width: 44px;
+  height: 44px;
+  line-height: 44px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  text-decoration: none;
+  text-align: center;
+  opacity: 0.65;
+  padding: 0 0 18px 10px;
+  color: #FFF;
+  font-style: normal;
+  font-size: 28px;
+  font-family: Arial, Baskerville, monospace; }
+  .mfp-close:hover,
+  .mfp-close:focus {
+    opacity: 1; }
+  .mfp-close:active {
+    top: 1px; }
+
+.mfp-close-btn-in .mfp-close {
+  color: #333; }
+
+.mfp-image-holder .mfp-close,
+.mfp-iframe-holder .mfp-close {
+  color: #FFF;
+  right: -6px;
+  text-align: right;
+  padding-right: 6px;
+  width: 100%; }
+
+.mfp-counter {
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #CCC;
+  font-size: 12px;
+  line-height: 18px;
+  white-space: nowrap; }
+
+.mfp-arrow {
+  position: absolute;
+  opacity: 0.65;
+  margin: 0;
+  top: 50%;
+  margin-top: -55px;
+  padding: 0;
+  width: 90px;
+  height: 110px;
+  -webkit-tap-highlight-color: transparent; }
+  .mfp-arrow:active {
+    margin-top: -54px; }
+  .mfp-arrow:hover,
+  .mfp-arrow:focus {
+    opacity: 1; }
+  .mfp-arrow:before,
+  .mfp-arrow:after {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    position: absolute;
+    left: 0;
+    top: 0;
+    margin-top: 35px;
+    margin-left: 35px;
+    border: medium inset transparent; }
+  .mfp-arrow:after {
+    border-top-width: 13px;
+    border-bottom-width: 13px;
+    top: 8px; }
+  .mfp-arrow:before {
+    border-top-width: 21px;
+    border-bottom-width: 21px;
+    opacity: 0.7; }
+
+.mfp-arrow-left {
+  left: 0; }
+  .mfp-arrow-left:after {
+    border-right: 17px solid #FFF;
+    margin-left: 31px; }
+  .mfp-arrow-left:before {
+    margin-left: 25px;
+    border-right: 27px solid #3F3F3F; }
+
+.mfp-arrow-right {
+  right: 0; }
+  .mfp-arrow-right:after {
+    border-left: 17px solid #FFF;
+    margin-left: 39px; }
+  .mfp-arrow-right:before {
+    border-left: 27px solid #3F3F3F; }
+
+.mfp-iframe-holder {
+  padding-top: 40px;
+  padding-bottom: 40px; }
+  .mfp-iframe-holder .mfp-content {
+    line-height: 0;
+    width: 100%;
+    max-width: 900px; }
+  .mfp-iframe-holder .mfp-close {
+    top: -40px; }
+
+.mfp-iframe-scaler {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  padding-top: 56.25%; }
+  .mfp-iframe-scaler iframe {
+    position: absolute;
+    display: block;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #000; }
+
+/* Main image in popup */
+img.mfp-img {
+  width: auto;
+  max-width: 100%;
+  height: auto;
+  display: block;
+  line-height: 0;
+  box-sizing: border-box;
+  padding: 40px 0 40px;
+  margin: 0 auto; }
+
+/* The shadow behind the image */
+.mfp-figure {
+  line-height: 0; }
+  .mfp-figure:after {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 40px;
+    bottom: 40px;
+    display: block;
+    right: 0;
+    width: auto;
+    height: auto;
+    z-index: -1;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #444; }
+  .mfp-figure small {
+    color: #BDBDBD;
+    display: block;
+    font-size: 12px;
+    line-height: 14px; }
+  .mfp-figure figure {
+    margin: 0; }
+
+.mfp-bottom-bar {
+  margin-top: -36px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: 100%;
+  cursor: auto; }
+
+.mfp-title {
+  text-align: left;
+  line-height: 18px;
+  color: #F3F3F3;
+  word-wrap: break-word;
+  padding-right: 36px; }
+
+.mfp-image-holder .mfp-content {
+  max-width: 100%; }
+
+.mfp-gallery .mfp-image-holder .mfp-figure {
+  cursor: pointer; }
+
+@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) {
+  /**
+       * Remove all paddings around the image on small screen
+       */
+  .mfp-img-mobile .mfp-image-holder {
+    padding-left: 0;
+    padding-right: 0; }
+  .mfp-img-mobile img.mfp-img {
+    padding: 0; }
+  .mfp-img-mobile .mfp-figure:after {
+    top: 0;
+    bottom: 0; }
+  .mfp-img-mobile .mfp-figure small {
+    display: inline;
+    margin-left: 5px; }
+  .mfp-img-mobile .mfp-bottom-bar {
+    background: rgba(0, 0, 0, 0.6);
+    bottom: 0;
+    margin: 0;
+    top: auto;
+    padding: 3px 5px;
+    position: fixed;
+    box-sizing: border-box; }
+    .mfp-img-mobile .mfp-bottom-bar:empty {
+      padding: 0; }
+  .mfp-img-mobile .mfp-counter {
+    right: 5px;
+    top: 3px; }
+  .mfp-img-mobile .mfp-close {
+    top: 0;
+    right: 0;
+    width: 35px;
+    height: 35px;
+    line-height: 35px;
+    background: rgba(0, 0, 0, 0.6);
+    position: fixed;
+    text-align: center;
+    padding: 0; } }
+
+@media all and (max-width: 900px) {
+  .mfp-arrow {
+    -webkit-transform: scale(0.75);
+    transform: scale(0.75); }
+  .mfp-arrow-left {
+    -webkit-transform-origin: 0;
+    transform-origin: 0; }
+  .mfp-arrow-right {
+    -webkit-transform-origin: 100%;
+    transform-origin: 100%; }
+  .mfp-container {
+    padding-left: 6px;
+    padding-right: 6px; } }

docs/assets/css/owl.carousel.css

@@ -0,0 +1,71 @@
+/* 
+ * 	Core Owl Carousel CSS File
+ *	v1.3.3
+ */
+
+/* clearfix */
+.owl-carousel .owl-wrapper:after {
+	content: ".";
+	display: block;
+	clear: both;
+	visibility: hidden;
+	line-height: 0;
+	height: 0;
+}
+/* display none until init */
+.owl-carousel{
+	display: none;
+	position: relative;
+	width: 100%;
+	-ms-touch-action: pan-y;
+}
+.owl-carousel .owl-wrapper{
+	display: none;
+	position: relative;
+	-webkit-transform: translate3d(0px, 0px, 0px);
+}
+.owl-carousel .owl-wrapper-outer{
+	overflow: hidden;
+	position: relative;
+	width: 100%;
+}
+.owl-carousel .owl-wrapper-outer.autoHeight{
+	-webkit-transition: height 500ms ease-in-out;
+	-moz-transition: height 500ms ease-in-out;
+	-ms-transition: height 500ms ease-in-out;
+	-o-transition: height 500ms ease-in-out;
+	transition: height 500ms ease-in-out;
+}
+	
+.owl-carousel .owl-item{
+	float: left;
+}
+.owl-controls .owl-page,
+.owl-controls .owl-buttons div{
+	cursor: pointer;
+}
+.owl-controls {
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+/* mouse grab icon */
+.grabbing { 
+    cursor:url(grabbing.png) 8 8, move;
+}
+
+/* fix */
+.owl-carousel  .owl-wrapper,
+.owl-carousel  .owl-item{
+	-webkit-backface-visibility: hidden;
+	-moz-backface-visibility:    hidden;
+	-ms-backface-visibility:     hidden;
+  -webkit-transform: translate3d(0,0,0);
+  -moz-transform: translate3d(0,0,0);
+  -ms-transform: translate3d(0,0,0);
+}
+

docs/assets/css/owl.theme.css

@@ -0,0 +1,79 @@
+/*
+* 	Owl Carousel Owl Demo Theme 
+*	v1.3.3
+*/
+
+.owl-theme .owl-controls{
+	margin-top: 10px;
+	text-align: center;
+}
+
+/* Styling Next and Prev buttons */
+
+.owl-theme .owl-controls .owl-buttons div{
+	color: #FFF;
+	display: inline-block;
+	zoom: 1;
+	*display: inline;/*IE7 life-saver */
+	margin: 5px;
+	padding: 3px 10px;
+	font-size: 12px;
+	-webkit-border-radius: 30px;
+	-moz-border-radius: 30px;
+	border-radius: 30px;
+	background: #869791;
+	filter: Alpha(Opacity=50);/*IE7 fix*/
+	opacity: 0.5;
+}
+/* Clickable class fix problem with hover on touch devices */
+/* Use it for non-touch hover action */
+.owl-theme .owl-controls.clickable .owl-buttons div:hover{
+	filter: Alpha(Opacity=100);/*IE7 fix*/
+	opacity: 1;
+	text-decoration: none;
+}
+
+/* Styling Pagination*/
+
+.owl-theme .owl-controls .owl-page{
+	display: inline-block;
+	zoom: 1;
+	*display: inline;/*IE7 life-saver */
+}
+.owl-theme .owl-controls .owl-page span{
+	display: block;
+	width: 12px;
+	height: 12px;
+	margin: 5px 7px;
+	filter: Alpha(Opacity=50);/*IE7 fix*/
+	opacity: 0.5;
+	-webkit-border-radius: 20px;
+	-moz-border-radius: 20px;
+	border-radius: 20px;
+	background: #869791;
+}
+
+.owl-theme .owl-controls .owl-page.active span,
+.owl-theme .owl-controls.clickable .owl-page:hover span{
+	filter: Alpha(Opacity=100);/*IE7 fix*/
+	opacity: 1;
+}
+
+/* If PaginationNumbers is true */
+
+.owl-theme .owl-controls .owl-page span.owl-numbers{
+	height: auto;
+	width: auto;
+	color: #FFF;
+	padding: 2px 10px;
+	font-size: 12px;
+	-webkit-border-radius: 30px;
+	-moz-border-radius: 30px;
+	border-radius: 30px;
+}
+
+/* preloading images */
+.owl-item.loading{
+	min-height: 150px;
+	background: url(AjaxLoader.gif) no-repeat center center
+}

docs/assets/favicons/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/assets/favicons/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

docs/assets/favicons/safari-pinned-tab.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="300.000000pt" height="300.000000pt" viewBox="0 0 300.000000 300.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,300.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M0 1500 l0 -1500 1500 0 1500 0 0 1500 0 1500 -1500 0 -1500 0 0
+-1500z"/>
+</g>
+</svg>

docs/assets/favicons/site.webmanifest

@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/assets/favicons/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/assets/favicons/android-chrome-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}